clean services files and remove un-ping-able ones

This commit is contained in:
Jean-Christian Paul Denis 2021-08-28 01:52:03 +02:00
parent 2acf82b4e0
commit cba24bc78c
10 changed files with 821 additions and 872 deletions

View File

@ -45,26 +45,26 @@ $__autoload['kutrlLog'] = $d . 'lib.kutrl.log.php';
# Services # Services
$__autoload['bilbolinksKutrlService'] = $d . 'services/class.bilbolinks.service.php'; $__autoload['bilbolinksKutrlService'] = $d . 'services/class.bilbolinks.service.php';
$core->addBehavior('kutrlService', function() { return ["bilbolinks","bilbolinksKutrlService"]; } ); $core->addBehavior('kutrlService', function() { return ["bilbolinks","bilbolinksKutrlService"]; } );
$__autoload['bitlyKutrlService'] = $d . 'services/class.bitly.service.php'; //$__autoload['bitlyKutrlService'] = $d . 'services/class.bitly.service.php';
$core->addBehavior('kutrlService', function() { return ["bitly","bitlyKutrlService"]; } ); //$core->addBehavior('kutrlService', function() { return ["bitly","bitlyKutrlService"]; } );
$__autoload['customKutrlService'] = $d . 'services/class.custom.service.php'; $__autoload['customKutrlService'] = $d . 'services/class.custom.service.php';
$core->addBehavior('kutrlService', function() { return ["custom","customKutrlService"]; } ); $core->addBehavior('kutrlService', function() { return ["custom","customKutrlService"]; } );
$__autoload['defaultKutrlService'] = $d . 'services/class.default.service.php'; $__autoload['defaultKutrlService'] = $d . 'services/class.default.service.php';
$core->addBehavior('kutrlService', function() { return ["default","defaultKutrlService"]; } ); $core->addBehavior('kutrlService', function() { return ["default","defaultKutrlService"]; } );
$__autoload['googlKutrlService'] = $d . 'services/class.googl.service.php'; //$__autoload['googlKutrlService'] = $d . 'services/class.googl.service.php';
$core->addBehavior('kutrlService', function() { return ["googl","googlKutrlService"]; } ); //$core->addBehavior('kutrlService', function() { return ["googl","googlKutrlService"]; } );
$__autoload['isgdKutrlService'] = $d . 'services/class.isgd.service.php'; $__autoload['isgdKutrlService'] = $d . 'services/class.isgd.service.php';
$core->addBehavior('kutrlService', function() { return ["isgd","isgdKutrlService"]; } ); $core->addBehavior('kutrlService', function() { return ["isgd","isgdKutrlService"]; } );
$__autoload['localKutrlService'] = $d . 'services/class.local.service.php'; $__autoload['localKutrlService'] = $d . 'services/class.local.service.php';
$core->addBehavior('kutrlService', function() { return ["local","localKutrlService"]; } ); $core->addBehavior('kutrlService', function() { return ["local","localKutrlService"]; } );
$__autoload['shorttoKutrlService'] = $d . 'services/class.shortto.service.php'; //$__autoload['shorttoKutrlService'] = $d . 'services/class.shortto.service.php';
$core->addBehavior('kutrlService', function() { return ["shortto","shorttoKutrlService"]; } ); //$core->addBehavior('kutrlService', function() { return ["shortto","shorttoKutrlService"]; } );
$__autoload['trimKutrlService'] = $d . 'services/class.trim.service.php'; //$__autoload['trimKutrlService'] = $d . 'services/class.trim.service.php';
$core->addBehavior('kutrlService', function() { return ["trim","trimKutrlService"]; } ); //$core->addBehavior('kutrlService', function() { return ["trim","trimKutrlService"]; } );
$__autoload['yourlsKutrlService'] = $d . 'services/class.yourls.service.php'; $__autoload['yourlsKutrlService'] = $d . 'services/class.yourls.service.php';
$core->addBehavior('kutrlService', function() { return ["yourls","yourlsKutrlService"]; } ); $core->addBehavior('kutrlService', function() { return ["yourls","yourlsKutrlService"]; } );
$__autoload['suprKutrlService'] = $d . 'services/class.supr.service.php'; //$__autoload['suprKutrlService'] = $d . 'services/class.supr.service.php';
$core->addBehavior('kutrlService', function() { return ["supr","suprKutrlService"]; } ); //$core->addBehavior('kutrlService', function() { return ["supr","suprKutrlService"]; } );
# Shorten url passed through wiki functions # Shorten url passed through wiki functions
$__autoload['kutrlWiki'] = $d . 'lib.wiki.kutrl.php'; $__autoload['kutrlWiki'] = $d . 'lib.wiki.kutrl.php';

View File

@ -10,22 +10,25 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
class bilbolinksKutrlService extends kutrlService class bilbolinksKutrlService extends kutrlService
{ {
protected $config = array( protected $config = [
'id' => 'bilbolinks', 'id' => 'bilbolinks',
'name' => 'BilboLinks', 'name' => 'BilboLinks',
'home' => 'http://www.tux-planet.fr/bilbobox/' 'home' => 'http://www.tux-planet.fr/bilbobox/'
); ];
protected function init() protected function init()
{ {
$base = (string) $this->settings->kutrl_srv_bilbolinks_base; $base = (string) $this->settings->kutrl_srv_bilbolinks_base;
if (!empty($base) && substr($base,-1,1) != '/') $base .= '/'; if (!empty($base) && substr($base, -1, 1) != '/') {
$base .= '/';
$this->config['url_api'] = $base.'api.php'; }
$this->config['url_api'] = $base . 'api.php';
$this->config['url_base'] = $base; $this->config['url_base'] = $base;
$this->config['url_min_len'] = 25; $this->config['url_min_len'] = 25;
} }
@ -33,65 +36,59 @@ class bilbolinksKutrlService extends kutrlService
public function saveSettings() public function saveSettings()
{ {
$base = ''; $base = '';
if (!empty($_POST['kutrl_srv_bilbolinks_base'])) if (!empty($_POST['kutrl_srv_bilbolinks_base'])) {
{
$base = $_POST['kutrl_srv_bilbolinks_base']; $base = $_POST['kutrl_srv_bilbolinks_base'];
if (substr($base,-1,1) != '/') $base .= '/'; if (substr($base, -1, 1) != '/') {
$base .= '/';
} }
}
$this->settings->put('kutrl_srv_bilbolinks_base',$base); $this->settings->put('kutrl_srv_bilbolinks_base', $base);
} }
public function settingsForm() public function settingsForm()
{ {
echo echo
'<p><label class="classic">'. '<p><label class="classic">' .
__('Url of the service:').'<br />'. __('Url of the service:') . '<br />' .
form::field(array('kutrl_srv_bilbolinks_base'),50,255,$this->settings->kutrl_srv_bilbolinks_base). form::field(['kutrl_srv_bilbolinks_base'], 50, 255, $this->settings->kutrl_srv_bilbolinks_base) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
__('This is the root URL of the "bilbolinks" service you want to use. Ex: "http://tux-pla.net/".'). __('This is the root URL of the "bilbolinks" service you want to use. Ex: "http://tux-pla.net/".') .
'</p>'; '</p>';
} }
public function testService() public function testService()
{ {
if (empty($this->url_base)) if (empty($this->url_base)) {
{
$this->error->add(__('Service is not well configured.')); $this->error->add(__('Service is not well configured.'));
return false; return false;
} }
$arg = array('longurl' => urlencode($this->url_test)); $arg = ['longurl' => urlencode($this->url_test)];
if (!self::post($this->url_api,$arg,true,true)) if (!self::post($this->url_api, $arg, true,true)) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
return true; return true;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$arg = array('longurl' => $url); $arg = ['longurl' => $url];
if (!($response = self::post($this->url_api,$arg,true,true))) if (!($response = self::post($this->url_api, $arg, true, true))) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
if ($response == 'You are too speed!') if ($response == 'You are too speed!') {
{
$this->error->add(__('Service rate limit exceeded.')); $this->error->add(__('Service rate limit exceeded.'));
return false; return false;
} }
$rs = new ArrayObject(); $rs = new ArrayObject();
$rs->hash = str_replace($this->url_base,'',$response); $rs->hash = str_replace($this->url_base, '', $response);
$rs->url = $url; $rs->url = $url;
$rs->type = $this->id; $rs->type = $this->id;
return $rs; return $rs;
} }
} }
?>

View File

@ -10,11 +10,13 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
class bitlyKutrlService extends kutrlService class bitlyKutrlService extends kutrlService
{ {
protected $config = array( protected $config = [
'id' => 'bitly', 'id' => 'bitly',
'name' => 'bit.ly', 'name' => 'bit.ly',
'home' => 'http://bit.ly', 'home' => 'http://bit.ly',
@ -22,14 +24,14 @@ class bitlyKutrlService extends kutrlService
'url_api' => 'http://api.bit.ly/v3/', 'url_api' => 'http://api.bit.ly/v3/',
'url_base' => 'http://bit.ly/', 'url_base' => 'http://bit.ly/',
'url_min_len' => 25 'url_min_len' => 25
); ];
private $args = array( private $args = [
'format' => 'xml', 'format' => 'xml',
'login' => '', 'login' => '',
'apiKey' => '', 'apiKey' => '',
'history' => 0 'history' => 0
); ];
protected function init() protected function init()
{ {
@ -40,47 +42,45 @@ class bitlyKutrlService extends kutrlService
public function saveSettings() public function saveSettings()
{ {
$this->settings->put('kutrl_srv_bitly_login',$_POST['kutrl_srv_bitly_login']); $this->settings->put('kutrl_srv_bitly_login', $_POST['kutrl_srv_bitly_login']);
$this->settings->put('kutrl_srv_bitly_apikey',$_POST['kutrl_srv_bitly_apikey']); $this->settings->put('kutrl_srv_bitly_apikey', $_POST['kutrl_srv_bitly_apikey']);
$this->settings->put('kutrl_srv_bitly_history',isset($_POST['kutrl_srv_bitly_history'])); $this->settings->put('kutrl_srv_bitly_history', isset($_POST['kutrl_srv_bitly_history']));
} }
public function settingsForm() public function settingsForm()
{ {
echo echo
'<p><label class="classic">'.__('Login:').'<br />'. '<p><label class="classic">' . __('Login:') . '<br />' .
form::field(array('kutrl_srv_bitly_login'),50,255,$this->settings->kutrl_srv_bitly_login). form::field(['kutrl_srv_bitly_login'], 50, 255, $this->settings->kutrl_srv_bitly_login) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
sprintf(__('This is your login to sign up to %s'),$this->config['name']). sprintf(__('This is your login to sign up to %s'), $this->config['name']) .
'</p>'. '</p>' .
'<p><label class="classic">'.__('API Key:').'<br />'. '<p><label class="classic">' . __('API Key:') . '<br />' .
form::field(array('kutrl_srv_bitly_apikey'),50,255,$this->settings->kutrl_srv_bitly_apikey). form::field(['kutrl_srv_bitly_apikey'], 50, 255, $this->settings->kutrl_srv_bitly_apikey) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
sprintf(__('This is your personnal %s API key. You can find it on your account page.'),$this->config['name']). sprintf(__('This is your personnal %s API key. You can find it on your account page.'), $this->config['name']) .
'</p>'. '</p>' .
'<p><label class="classic">'. '<p><label class="classic">' .
form::checkbox(array('kutrl_srv_bitly_history'),'1',$this->settings->kutrl_srv_bitly_history).' '. form::checkbox(['kutrl_srv_bitly_history'], '1', $this->settings->kutrl_srv_bitly_history) . ' ' .
__('Publish history'). __('Publish history') .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
__('This publish all short links on your bit.ly public page.'). __('This publish all short links on your bit.ly public page.') .
'</p>'; '</p>';
} }
public function testService() public function testService()
{ {
if (empty($this->args['login']) || empty($this->args['apiKey'])) if (empty($this->args['login']) || empty($this->args['apiKey'])) {
{
$this->error->add(__('Service is not well configured.')); $this->error->add(__('Service is not well configured.'));
return false; return false;
} }
$args = $this->args; $args = $this->args;
$args['hash'] = 'WP9vc'; $args['hash'] = 'WP9vc';
if (!($response = self::post($this->url_api.'expand',$args,true))) if (!($response = self::post($this->url_api . 'expand', $args, true))) {
{
$this->error->add(__('Failed to call service.')); $this->error->add(__('Failed to call service.'));
return false; return false;
} }
@ -90,19 +90,18 @@ class bitlyKutrlService extends kutrlService
$err_msg = (string) $rsp->status_txt; $err_msg = (string) $rsp->status_txt;
if ($err_msg != 'OK') { if ($err_msg != 'OK') {
$err_no = (integer) $rsp->status_code; $err_no = (integer) $rsp->status_code;
$this->error->add(sprintf(__('An error occured with code %s and message "%s"'),$err_no,$err_msg)); $this->error->add(sprintf(__('An error occured with code %s and message "%s"'), $err_no, $err_msg));
return false; return false;
} }
return true; return true;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$args = $this->args; $args = $this->args;
$args['longUrl'] = $url; $args['longUrl'] = $url;
if (!($response = self::post($this->url_api.'shorten',$args,true))) if (!($response = self::post($this->url_api . 'shorten', $args, true))) {
{
$this->error->add(__('Failed to call service.')); $this->error->add(__('Failed to call service.'));
return false; return false;
} }
@ -112,7 +111,7 @@ class bitlyKutrlService extends kutrlService
$err_msg = (string) $rsp->status_txt; $err_msg = (string) $rsp->status_txt;
if ($err_msg != 'OK') { if ($err_msg != 'OK') {
$err_no = (integer) $rsp->status_code; $err_no = (integer) $rsp->status_code;
$this->error->add(sprintf(__('An error occured with code %s and message "%s"'),$err_no,$err_msg)); $this->error->add(sprintf(__('An error occured with code %s and message "%s"'), $err_no, $err_msg));
return false; return false;
} }
@ -124,4 +123,3 @@ class bitlyKutrlService extends kutrlService
return $rs; return $rs;
} }
} }
?>

View File

@ -10,21 +10,23 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
class customKutrlService extends kutrlService class customKutrlService extends kutrlService
{ {
protected $config = array( protected $config = [
'id' => 'custom', 'id' => 'custom',
'name' => 'Custom' 'name' => 'Custom'
); ];
protected function init() protected function init()
{ {
$config = unserialize(base64_decode($this->settings->kutrl_srv_custom)); $config = unserialize(base64_decode($this->settings->kutrl_srv_custom));
if (!is_array($config)) if (!is_array($config))
{ {
$config = array(); $config = [];
} }
$this->config['url_api'] = !empty($config['url_api']) ? $config['url_api'] : ''; $this->config['url_api'] = !empty($config['url_api']) ? $config['url_api'] : '';
@ -37,84 +39,80 @@ class customKutrlService extends kutrlService
public function saveSettings() public function saveSettings()
{ {
$config = array( $config = [
'url_api' => $_POST['kutrl_srv_custom_url_api'], 'url_api' => $_POST['kutrl_srv_custom_url_api'],
'url_base' => $_POST['kutrl_srv_custom_url_base'], 'url_base' => $_POST['kutrl_srv_custom_url_base'],
'url_param' => $_POST['kutrl_srv_custom_url_param'], 'url_param' => $_POST['kutrl_srv_custom_url_param'],
'url_encode' => !empty($_POST['kutrl_srv_custom_url_encode']) 'url_encode' => !empty($_POST['kutrl_srv_custom_url_encode'])
); ];
$this->settings->put('kutrl_srv_custom',base64_encode(serialize($config))); $this->settings->put('kutrl_srv_custom', base64_encode(serialize($config)));
} }
public function settingsForm() public function settingsForm()
{ {
$default = array( $default = [
'url_api' => '', 'url_api' => '',
'url_base' => '', 'url_base' => '',
'url_param' => '', 'url_param' => '',
'url_encode' => true 'url_encode' => true
); ];
$config = unserialize(base64_decode($this->settings->kutrl_srv_custom)); $config = unserialize(base64_decode($this->settings->kutrl_srv_custom));
if (!is_array($config)) if (!is_array($config)) {
{ $config = [];
$config = array();
} }
$config = array_merge($default,$config); $config = array_merge($default, $config);
echo echo
'<p>'.__('You can set a configurable service.').'<br />'. '<p>' . __('You can set a configurable service.') . '<br />' .
__('It consists on a simple query to an URL with only one param.').'<br />'. __('It consists on a simple query to an URL with only one param.') . '<br />' .
__('It must respond with a http code 200 on success.').'<br />'. __('It must respond with a http code 200 on success.') . '<br />' .
__('It must returned the short URL (or only hash) in clear text.').'</p>' . __('It must returned the short URL (or only hash) in clear text.') . '</p>' .
'<p><label class="classic">'.__('API URL:').'<br />'. '<p><label class="classic">' . __('API URL:') . '<br />' .
form::field(array('kutrl_srv_custom_url_api'),50,255,$config['url_api']). form::field(['kutrl_srv_custom_url_api'], 50, 255, $config['url_api']) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'.__('Full path to API of the URL shortener. ex: "http://is.gd/api.php"').'</p>'. '<p class="form-note">' . __('Full path to API of the URL shortener. ex: "http://is.gd/api.php"') . '</p>' .
'<p><label class="classic">'.__('Short URL domain:').'<br />'. '<p><label class="classic">' . __('Short URL domain:') . '<br />' .
form::field(array('kutrl_srv_custom_url_base'),50,255,$config['url_base']). form::field(['kutrl_srv_custom_url_base'], 50, 255, $config['url_base']) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'.__('Common part of the short URL. ex: "http://is.gd/"').'</p>'. '<p class="form-note">' . __('Common part of the short URL. ex: "http://is.gd/"') . '</p>' .
'<p><label class="classic">'.__('API URL param:').'<br />'. '<p><label class="classic">' . __('API URL param:') . '<br />' .
form::field(array('kutrl_srv_custom_url_param'),50,255,$config['url_param']). form::field(['kutrl_srv_custom_url_param'], 50, 255, $config['url_param']) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'.__('Param of the query. ex: "longurl"').'</p>'. '<p class="form-note">' . __('Param of the query. ex: "longurl"') . '</p>' .
'<p><label class="classic">'. '<p><label class="classic">' .
form::checkbox(array('kutrl_srv_custom_url_encode'),'1',$config['url_encode']).' '. form::checkbox(['kutrl_srv_custom_url_encode'], '1', $config['url_encode']) . ' ' .
__('Encode URL'). __('Encode URL') .
'</label></p>'; '</label></p>';
} }
public function testService() public function testService()
{ {
if (empty($this->url_api)) return false; if (empty($this->url_api)) {
return false;
}
$url = $this->url_encode ? urlencode($this->url_test) : $this->url_test; $url = $this->url_encode ? urlencode($this->url_test) : $this->url_test;
$arg = array($this->url_param => $url); $arg = [$this->url_param => $url];
if (!self::post($this->url_api,$arg,true,true)) if (!self::post($this->url_api, $arg, true, true)) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
return true; return true;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$enc = $this->url_encode ? urlencode($url) : $url; $enc = $this->url_encode ? urlencode($url) : $url;
$arg = array($this->url_param => $enc); $arg = array($this->url_param => $enc);
if (!($response = self::post($this->url_api,$arg,true,true))) if (!($response = self::post($this->url_api, $arg, true, true))) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
$rs = new ArrayObject(); $rs = new ArrayObject();
$rs->hash = str_replace($this->url_base,'',$response); $rs->hash = str_replace($this->url_base, '', $response);
$rs->url = $url; $rs->url = $url;
$rs->type = $this->id; $rs->type = $this->id;
return $rs; return $rs;
} }
} }
?>

View File

@ -10,7 +10,9 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
# nb: "default" ne veut pas dire service par défaut # nb: "default" ne veut pas dire service par défaut
# mais service simple et rapide configuré par des constantes # mais service simple et rapide configuré par des constantes
@ -21,7 +23,7 @@ class defaultKutrlService extends kutrlService
{ {
protected function init() protected function init()
{ {
$this->config = array( $this->config = [
'id' => 'default', 'id' => 'default',
'name' => 'Default', 'name' => 'Default',
'home' => '', 'home' => '',
@ -32,27 +34,27 @@ class defaultKutrlService extends kutrlService
'url_param' => SHORTEN_SERVICE_PARAM, 'url_param' => SHORTEN_SERVICE_PARAM,
'url_encode' => SHORTEN_SERVICE_ENCODE 'url_encode' => SHORTEN_SERVICE_ENCODE
); ];
} }
public function settingsForm() public function settingsForm()
{ {
echo echo
'<p class="form-note">'. '<p class="form-note">' .
__('There is nothing to configure for this service.'). __('There is nothing to configure for this service.') .
'</p>'. '</p>' .
'<p>'.__('This service is set to:').'</p>'. '<p>' . __('This service is set to:') . '</p>' .
'<dl>'. '<dl>' .
'<dt>'.__('Service name:').'</dt>'. '<dt>' . __('Service name:') . '</dt>' .
'<dd>'.SHORTEN_SERVICE_NAME.'</dd>'. '<dd>' . SHORTEN_SERVICE_NAME . '</dd>' .
'<dt>'.__('Full API URL:').'</dt>'. '<dt>' . __('Full API URL:') . '</dt>' .
'<dd>'.SHORTEN_SERVICE_API.'</dd>'. '<dd>' . SHORTEN_SERVICE_API . '</dd>' .
'<dt>'.__('Query param:').'</dt>'. '<dt>' . __('Query param:') . '</dt>' .
'<dd>'.SHORTEN_SERVICE_PARAM.'</dd>'. '<dd>' . SHORTEN_SERVICE_PARAM . '</dd>' .
'<dt>'.__('Short URL domain:').'</dt>'. '<dt>' . __('Short URL domain:') . '</dt>' .
'<dd>'.SHORTEN_SERVICE_BASE.'</dd>'. '<dd>' . SHORTEN_SERVICE_BASE . '</dd>' .
'<dt>'.__('Encode URL:').'</dt>'. '<dt>' . __('Encode URL:') . '</dt>' .
'<dd>'.(SHORTEN_SERVICE_ENCODE ? __('yes') : __('no')).'</dd>'. '<dd>' . (SHORTEN_SERVICE_ENCODE ? __('yes') : __('no')) . '</dd>' .
'</dl>'; '</dl>';
} }
@ -61,31 +63,28 @@ class defaultKutrlService extends kutrlService
$url = $this->url_encode ? urlencode($this->url_test) : $this->url_test; $url = $this->url_encode ? urlencode($this->url_test) : $this->url_test;
$arg = array($this->url_param => urlencode($this->url_test)); $arg = array($this->url_param => urlencode($this->url_test));
if (!self::post($this->url_api,$arg,true,true)) if (!self::post($this->url_api, $arg, true, true)) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
return true; return true;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$enc = $this->url_encode ? urlencode($url) : $url; $enc = $this->url_encode ? urlencode($url) : $url;
$arg = array($this->url_param => $url); $arg = array($this->url_param => $url);
if (!($response = self::post($this->url_api,$arg,true,true))) if (!($response = self::post($this->url_api, $arg, true, true))) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
$rs = new ArrayObject(); $rs = new ArrayObject();
$rs->hash = str_replace($this->url_base,'',$response); $rs->hash = str_replace($this->url_base, '', $response);
$rs->url = $url; $rs->url = $url;
$rs->type = $this->id; $rs->type = $this->id;
return $rs; return $rs;
} }
} }
?>

View File

@ -10,7 +10,9 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
class googlKutrlService extends kutrlService class googlKutrlService extends kutrlService
{ {
@ -20,9 +22,9 @@ class googlKutrlService extends kutrlService
private $url_api = 'https://www.googleapis.com/urlshortener/v1/url'; private $url_api = 'https://www.googleapis.com/urlshortener/v1/url';
private $url_test = 'http://dotclear.jcdenis.com/go/kUtRL'; private $url_test = 'http://dotclear.jcdenis.com/go/kUtRL';
private $args = array( private $args = [
'key' => 'AIzaSyDE1WfOMdnrnX8p51jSmVodenaNk385asc' 'key' => 'AIzaSyDE1WfOMdnrnX8p51jSmVodenaNk385asc'
); ];
private $headers = array('Content-Type: application/json'); private $headers = array('Content-Type: application/json');
protected function init() protected function init()
@ -34,9 +36,8 @@ class googlKutrlService extends kutrlService
public function testService() public function testService()
{ {
$args = $this->args; $args = $this->args;
$args['shortUrl'] = $this->url_base.'PLovn'; $args['shortUrl'] = $this->url_base . 'PLovn';
if (!($response = self::post($this->url_api,$args,true,true,$this->headers))) if (!($response = self::post($this->url_api, $args, true, true, $this->headers))) {
{
$this->error->add(__('Failed to call service.')); $this->error->add(__('Failed to call service.'));
return false; return false;
} }
@ -50,14 +51,13 @@ class googlKutrlService extends kutrlService
return true; return true;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$args = $this->args; $args = $this->args;
$args['longUrl'] = $url; $args['longUrl'] = $url;
$args = json_encode($args); $args = json_encode($args);
if (!($response = self::post($this->url_api,$args,true,false,$this->headers))) if (!($response = self::post($this->url_api, $args, true, false, $this->headers))) {
{
$this->error->add(__('Failed to call service.')); $this->error->add(__('Failed to call service.'));
return false; return false;
} }
@ -70,11 +70,10 @@ class googlKutrlService extends kutrlService
} }
$rs = new ArrayObject(); $rs = new ArrayObject();
$rs->hash = str_replace($this->url_base,'',$rsp->id); $rs->hash = str_replace($this->url_base, '', $rsp->id);
$rs->url = $rsp->longUrl; $rs->url = $rsp->longUrl;
$rs->type = $this->id; $rs->type = $this->id;
return $rs; return $rs;
} }
} }
?>

View File

@ -14,7 +14,7 @@ if (!defined('DC_RC_PATH')){return;}
class isgdKutrlService extends kutrlService class isgdKutrlService extends kutrlService
{ {
protected $config = array( protected $config = [
'id' => 'isgd', 'id' => 'isgd',
'name' => 'is.gd', 'name' => 'is.gd',
'home' => 'http://is.gd/', 'home' => 'http://is.gd/',
@ -22,35 +22,32 @@ class isgdKutrlService extends kutrlService
'url_api' => 'http://is.gd/api.php', 'url_api' => 'http://is.gd/api.php',
'url_base' => 'http://is.gd/', 'url_base' => 'http://is.gd/',
'url_min_length' => 25 'url_min_length' => 25
); ];
public function testService() public function testService()
{ {
$arg = array('longurl' => urlencode($this->url_test)); $arg = ['longurl' => urlencode($this->url_test)];
if (!self::post($this->url_api,$arg,true,true)) if (!self::post($this->url_api, $arg, true, true)) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
return true; return true;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$arg = array('longurl' => $url); $arg = ['longurl' => $url];
if (!($response = self::post($this->url_api,$arg,true,true))) if (!($response = self::post($this->url_api, $arg, true, true))) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
$rs = new ArrayObject(); $rs = new ArrayObject();
$rs->hash = str_replace($this->url_base,'',$response); $rs->hash = str_replace($this->url_base, '', $response);
$rs->url = $url; $rs->url = $url;
$rs->type = $this->id; $rs->type = $this->id;
return $rs; return $rs;
} }
} }
?>

View File

@ -10,90 +10,91 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
class localKutrlService extends kutrlService class localKutrlService extends kutrlService
{ {
protected $config = array( protected $config = [
'id' => 'local', 'id' => 'local',
'name' => 'kUtRL', 'name' => 'kUtRL',
'home' => 'http://kutrl.fr', 'home' => 'http://kutrl.fr',
'allow_custom_hash' => true 'allow_custom_hash' => true
); ];
protected function init() protected function init()
{ {
$protocols = (string) $this->settings->kutrl_srv_local_protocols; $protocols = (string) $this->settings->kutrl_srv_local_protocols;
$this->config['allow_protocols'] = empty($protocols) ? array() : explode(',',$protocols); $this->config['allow_protocols'] = empty($protocols) ? [] : explode(',', $protocols);
$this->config['url_base'] = $this->core->blog->url.$this->core->url->getBase('kutrl').'/'; $this->config['url_base'] = $this->core->blog->url . $this->core->url->getBase('kutrl') . '/';
$this->config['url_min_len'] = strlen($this->url_base) + 2; $this->config['url_min_len'] = strlen($this->url_base) + 2;
} }
public function saveSettings() public function saveSettings()
{ {
$this->settings->put('kutrl_srv_local_protocols',$_POST['kutrl_srv_local_protocols'],'string'); $this->settings->put('kutrl_srv_local_protocols', $_POST['kutrl_srv_local_protocols'], 'string');
$this->settings->put('kutrl_srv_local_public',isset($_POST['kutrl_srv_local_public']),'boolean'); $this->settings->put('kutrl_srv_local_public', isset($_POST['kutrl_srv_local_public']), 'boolean');
$this->settings->put('kutrl_srv_local_css',$_POST['kutrl_srv_local_css'],'string'); $this->settings->put('kutrl_srv_local_css', $_POST['kutrl_srv_local_css'], 'string');
$this->settings->put('kutrl_srv_local_404_active',isset($_POST['kutrl_srv_local_404_active']),'boolean'); $this->settings->put('kutrl_srv_local_404_active', isset($_POST['kutrl_srv_local_404_active']), 'boolean');
} }
public function settingsForm() public function settingsForm()
{ {
echo echo
'<div class="two-cols"><div class="col">'. '<div class="two-cols"><div class="col">' .
'<p><strong>'.__('Settings:').'</strong></p>'. '<p><strong>' . __('Settings:') . '</strong></p>' .
'<p><label class="classic">'. '<p><label class="classic">' .
__('Allowed protocols:').'<br />'. __('Allowed protocols:') . '<br />' .
form::field(array('kutrl_srv_local_protocols'),50,255,$this->settings->kutrl_srv_local_protocols). form::field(['kutrl_srv_local_protocols'], 50, 255, $this->settings->kutrl_srv_local_protocols) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
__('Use comma seperated list like: "http:,https:,ftp:"'). __('Use comma seperated list like: "http:,https:,ftp:"') .
'</p>'. '</p>' .
'<p><label class="classic">'. '<p><label class="classic">' .
form::checkbox(array('kutrl_srv_local_public'),'1',$this->settings->kutrl_srv_local_public).' '. form::checkbox(['kutrl_srv_local_public'], '1', $this->settings->kutrl_srv_local_public) . ' ' .
__('Enable public page for visitors to shorten links'). __('Enable public page for visitors to shorten links') .
'</label></p>'. '</label></p>' .
'<p class="area" id="style-area"><label for="_style">'.__('CSS:').'</label>'. '<p class="area" id="style-area"><label for="_style">' . __('CSS:') . '</label>' .
form::textarea('kutrl_srv_local_css',50,3,html::escapeHTML($this->settings->kutrl_srv_local_css),'',2). form::textarea('kutrl_srv_local_css',50,3,html::escapeHTML($this->settings->kutrl_srv_local_css), '', 2) .
'</p>'. '</p>' .
'<p class="form-note">'.__('You can add here special cascading style sheet. Body of page has class "dc-kutrl" and widgets have class "shortenkutrlwidget" and "rankkutrlwidget".').'</p>'. '<p class="form-note">' . __('You can add here special cascading style sheet. Body of page has class "dc-kutrl" and widgets have class "shortenkutrlwidget" and "rankkutrlwidget".') . '</p>' .
'<p><label class="classic">'. '<p><label class="classic">' .
form::checkbox(array('kutrl_srv_local_404_active'),'1',$this->settings->kutrl_srv_local_404_active).' '. form::checkbox(['kutrl_srv_local_404_active'], '1', $this->settings->kutrl_srv_local_404_active) . ' ' .
__('Enable special 404 error public page for unknow urls'). __('Enable special 404 error public page for unknow urls') .
'</label></p>'. '</label></p>' .
'<p class="form-note">'.__('If this is not activated, the default 404 page of the theme will be display.').'</p>'. '<p class="form-note">' . __('If this is not activated, the default 404 page of the theme will be display.') . '</p>' .
'</div><div class="col">'. '</div><div class="col">' .
'<p><strong>'.__('Note:').'</strong></p>'. '<p><strong>' . __('Note:') . '</strong></p>' .
'<p>'. '<p>' .
__('This service use your own Blog to shorten and serve URL.').'<br />'. __('This service use your own Blog to shorten and serve URL.') . '<br />' .
sprintf(__('This means that with this service short links start with "%s".'),$this->url_base). sprintf(__('This means that with this service short links start with "%s".'), $this->url_base) .
'</p>'. '</p>' .
'<p>'. '<p>' .
__("You can use Dotclear's plugin called myUrlHandlers to change short links prefix on your blog."); __("You can use Dotclear's plugin called myUrlHandlers to change short links prefix on your blog.");
if (preg_match('/index\.php/',$this->url_base)) if (preg_match('/index\.php/', $this->url_base)) {
{
echo echo
'<p>'. '<p>' .
__("We recommand that you use a rewrite engine in order to remove 'index.php' from your blog's URL."). __("We recommand that you use a rewrite engine in order to remove 'index.php' from your blog's URL.") .
'<br /><a href="http://fr.dotclear.org/documentation/2.0/usage/blog-parameters">'. '<br /><a href="http://fr.dotclear.org/documentation/2.0/usage/blog-parameters">' .
__("You can find more about this on the Dotclear's documentation."). __("You can find more about this on the Dotclear's documentation.") .
'</a></p>'; '</a></p>';
} }
echo echo
'</p>'. '</p>' .
'<p>'.__('There are two templates delivered with kUtRL, if you do not use default theme, you may adapt them to yours.').'<br />'. '<p>' . __('There are two templates delivered with kUtRL, if you do not use default theme, you may adapt them to yours.') . '<br />' .
__('Files are in plugin directory /default-templates, just copy them into your theme and edit them.').'</p>'. __('Files are in plugin directory /default-templates, just copy them into your theme and edit them.') . '</p>' .
'</div></div>'; '</div></div>';
} }
@ -101,17 +102,15 @@ class localKutrlService extends kutrlService
public function testService() public function testService()
{ {
$ap = $this->allow_protocols; $ap = $this->allow_protocols;
if (!empty($ap)) if (!empty($ap)) {
{
return true; return true;
} } else {
else {
$this->error->add(__('Service is not well configured.')); $this->error->add(__('Service is not well configured.'));
return false; return false;
} }
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
# Create response object # Create response object
$rs = new ArrayObject(); $rs = new ArrayObject();
@ -119,45 +118,35 @@ class localKutrlService extends kutrlService
$rs->url = $url; $rs->url = $url;
# Normal link # Normal link
if ($hash === null) if ($hash === null) {
{
$type = 'localnormal'; $type = 'localnormal';
$rs->hash = $this->next($this->last('localnormal')); $rs->hash = $this->next($this->last('localnormal'));
}
# Mixed custom link # Mixed custom link
elseif (preg_match('/^([A-Za-z0-9]{2,})\!\!$/',$hash,$m)) } elseif (preg_match('/^([A-Za-z0-9]{2,})\!\!$/', $hash, $m)) {
{
$type = 'localmix'; $type = 'localmix';
$rs->hash = $m[1].$this->next(-1,$m[1]); $rs->hash = $m[1] . $this->next(-1, $m[1]);
}
# Custom link # Custom link
elseif (preg_match('/^[A-Za-z0-9\.\-\_]{2,}$/',$hash)) } elseif (preg_match('/^[A-Za-z0-9\.\-\_]{2,}$/', $hash)) {
{ if (false !== $this->log->select(null, $hash, null, 'local')) {
if (false !== $this->log->select(null,$hash,null,'local'))
{
$this->error->add(__('Custom short link is already taken.')); $this->error->add(__('Custom short link is already taken.'));
return false; return false;
} }
$type = 'localcustom'; $type = 'localcustom';
$rs->hash = $hash; $rs->hash = $hash;
}
# Wrong char in custom hash # Wrong char in custom hash
else } else {
{
$this->error->add(__('Custom short link is not valid.')); $this->error->add(__('Custom short link is not valid.'));
return false; return false;
} }
# Save link # Save link
try { try {
$this->log->insert($rs->url,$rs->hash,$type,$rs->type); $this->log->insert($rs->url, $rs->hash, $type, $rs->type);
return $rs; return $rs;
} } catch (Exception $e) {
catch (Exception $e)
{
$this->error->add(__('Failed to save link.')); $this->error->add(__('Failed to save link.'));
} }
return false; return false;
@ -166,106 +155,83 @@ class localKutrlService extends kutrlService
protected function last($type) protected function last($type)
{ {
return return
false === ($rs = $this->log->select(null,null,$type,'local')) ? false === ($rs = $this->log->select(null, null, $type, 'local')) ?
-1 : $rs->hash; -1 : $rs->hash;
} }
protected function next($last_id,$prefix='') protected function next($last_id, $prefix = '')
{
if ($last_id == -1)
{ {
if ($last_id == -1) {
$next_id = 0; $next_id = 0;
} } else {
else for($x = 1; $x <= strlen($last_id); $x++) {
{
for($x = 1; $x <= strlen($last_id); $x++)
{
$pos = strlen($last_id) - $x; $pos = strlen($last_id) - $x;
if ($last_id[$pos] != 'z') if ($last_id[$pos] != 'z') {
{ $next_id = $this->increment($last_id, $pos);
$next_id = $this->increment($last_id,$pos);
break; break;
} }
} }
if (!isset($next_id)) {
if (!isset($next_id))
{
$next_id = $this->append($last_id); $next_id = $this->append($last_id);
} }
} }
return return
false === $this->log->select(null,$prefix.$next_id,null,'local') ? false === $this->log->select(null,$prefix . $next_id, null, 'local') ?
$next_id : $this->next($next_id,$prefix); $next_id : $this->next($next_id, $prefix);
} }
protected function append($id) protected function append($id)
{ {
$id = str_split($id); $id = str_split($id);
for ($x = 0; $x < count($id); $x++) for ($x = 0; $x < count($id); $x++) {
{
$id[$x] = 0; $id[$x] = 0;
} }
return implode($id).'0'; return implode($id) . '0';
} }
protected function increment($id,$pos) protected function increment($id, $pos)
{ {
$id = str_split($id); $id = str_split($id);
$char = $id[$pos]; $char = $id[$pos];
if (is_numeric($char)) if (is_numeric($char)) {
{
$new_char = $char < 9 ? $char + 1 : 'a'; $new_char = $char < 9 ? $char + 1 : 'a';
} } else {
else
{
$new_char = chr(ord($char) + 1); $new_char = chr(ord($char) + 1);
} }
$id[$pos] = $new_char; $id[$pos] = $new_char;
if ($pos != (count($id) - 1)) if ($pos != (count($id) - 1)) {
{ for ($x = ($pos + 1); $x < count($id); $x++) {
for ($x = ($pos + 1); $x < count($id); $x++)
{
$id[$x] = 0; $id[$x] = 0;
} }
} }
return implode($id); return implode($id);
} }
public function getUrl($hash) public function getUrl($hash)
{ {
if (false === ($rs = $this->log->select(null,$hash,null,'local'))) if (false === ($rs = $this->log->select(null, $hash, null, 'local'))) {
{
return false; return false;
} }
if (!$rs->url) //previously removed url if (!$rs->url) { //previously removed url
{
return false; return false;
} }
$this->log->counter($rs->id, 'up');
$this->log->counter($rs->id,'up');
return $rs->url; return $rs->url;
} }
public function deleteUrl($url,$delete=false) public function deleteUrl($url, $delete = false)
{
if (false === ($rs = $this->log->select($url,null,null,'local')))
{ {
if (false === ($rs = $this->log->select($url, null, null, 'local'))) {
return false; return false;
} }
if ($delete) if ($delete) {
{
$this->log->delete($rs->id); $this->log->delete($rs->id);
} } else {
else $this->log->clear($rs->id, '');
{
$this->log->clear($rs->id,'');
} }
return true; return true;
} }
} }
?>

View File

@ -10,11 +10,13 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
class shorttoKutrlService extends kutrlService class shorttoKutrlService extends kutrlService
{ {
protected $config = array( protected $config = [
'id' => 'shortto', 'id' => 'shortto',
'name' => 'short.to', 'name' => 'short.to',
'home' => 'http://short.to', 'home' => 'http://short.to',
@ -22,35 +24,32 @@ class shorttoKutrlService extends kutrlService
'url_api' => 'http://short.to/s.txt', 'url_api' => 'http://short.to/s.txt',
'url_base' => 'http://short.to/', 'url_base' => 'http://short.to/',
'url_min_len' => 25 'url_min_len' => 25
); ];
public function testService() public function testService()
{ {
$arg = array('url' => urlencode($this->url_test)); $arg = ['url' => urlencode($this->url_test)];
if (!self::post($this->url_api,$arg,true,true)) if (!self::post($this->url_api, $arg, true, true)) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
return true; return true;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$arg = array('url' => $url); $arg = ['url' => $url];
if (!($response = self::post($this->url_api,$arg,true,true))) if (!($response = self::post($this->url_api, $arg, true, true))) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
$rs = new ArrayObject(); $rs = new ArrayObject();
$rs->hash = str_replace($this->url_base,'',$response); $rs->hash = str_replace($this->url_base, '', $response);
$rs->url = $url; $rs->url = $url;
$rs->type = $this->id; $rs->type = $this->id;
return $rs; return $rs;
} }
} }
?>

View File

@ -10,22 +10,24 @@
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
# -- END LICENSE BLOCK ------------------------------------ # -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')){return;} if (!defined('DC_RC_PATH')) {
return null;
}
class yourlsKutrlService extends kutrlService class yourlsKutrlService extends kutrlService
{ {
protected $config = array( protected $config = [
'id' => 'yourls', 'id' => 'yourls',
'name' => 'YOURLS', 'name' => 'YOURLS',
'home' => 'http://yourls.org' 'home' => 'http://yourls.org'
); ];
private $args = array( private $args = [
'username' => '', 'username' => '',
'password' => '', 'password' => '',
'format' => 'xml', 'format' => 'xml',
'action' => 'shorturl' 'action' => 'shorturl'
); ];
protected function init() protected function init()
{ {
@ -42,39 +44,38 @@ class yourlsKutrlService extends kutrlService
public function saveSettings() public function saveSettings()
{ {
$this->settings->put('kutrl_srv_yourls_username',$_POST['kutrl_srv_yourls_username']); $this->settings->put('kutrl_srv_yourls_username', $_POST['kutrl_srv_yourls_username']);
$this->settings->put('kutrl_srv_yourls_password',$_POST['kutrl_srv_yourls_password']); $this->settings->put('kutrl_srv_yourls_password', $_POST['kutrl_srv_yourls_password']);
$this->settings->put('kutrl_srv_yourls_base',$_POST['kutrl_srv_yourls_base']); $this->settings->put('kutrl_srv_yourls_base', $_POST['kutrl_srv_yourls_base']);
} }
public function settingsForm() public function settingsForm()
{ {
echo echo
'<p><label class="classic">'. '<p><label class="classic">' .
__('Url of the service:').'<br />'. __('Url of the service:') . '<br />' .
form::field(array('kutrl_srv_yourls_base'),50,255,$this->settings->kutrl_srv_yourls_base). form::field(['kutrl_srv_yourls_base'], 50, 255, $this->settings->kutrl_srv_yourls_base) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
__('This is the URL of the YOURLS service you want to use. Ex: "http://www.smaller.org/api.php".'). __('This is the URL of the YOURLS service you want to use. Ex: "http://www.smaller.org/api.php".') .
'</p>'. '</p>' .
'<p><label class="classic">'.__('Login:').'<br />'. '<p><label class="classic">' . __('Login:') . '<br />' .
form::field(array('kutrl_srv_yourls_username'),50,255,$this->settings->kutrl_srv_yourls_username). form::field(['kutrl_srv_yourls_username'], 50, 255, $this->settings->kutrl_srv_yourls_username) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
__('This is your user name to sign up to this YOURLS service.'). __('This is your user name to sign up to this YOURLS service.') .
'</p>'. '</p>' .
'<p><label class="classic">'.__('Password:').'<br />'. '<p><label class="classic">' . __('Password:') . '<br />' .
form::field(array('kutrl_srv_yourls_password'),50,255,$this->settings->kutrl_srv_yourls_password). form::field(['kutrl_srv_yourls_password'], 50, 255, $this->settings->kutrl_srv_yourls_password) .
'</label></p>'. '</label></p>' .
'<p class="form-note">'. '<p class="form-note">' .
__('This is your password to sign up to this YOURLS service.'). __('This is your password to sign up to this YOURLS service.') .
'</p>'; '</p>';
} }
public function testService() public function testService()
{ {
if (empty($this->url_api)) if (empty($this->url_api)) {
{
$this->error->add(__('Service is not well configured.')); $this->error->add(__('Service is not well configured.'));
return false; return false;
} }
@ -82,36 +83,32 @@ class yourlsKutrlService extends kutrlService
$args = $this->args; $args = $this->args;
$args['url'] = $this->url_test; $args['url'] = $this->url_test;
if (!($response = self::post($this->url_api,$this->args,true))) if (!($response = self::post($this->url_api, $this->args, true))) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
$rsp = @simplexml_load_string($response); $rsp = @simplexml_load_string($response);
if ($rsp && $rsp->status == 'success') if ($rsp && $rsp->status == 'success') {
{
return true; return true;
} }
$this->error->add(__('Authentication to service failed.')); $this->error->add(__('Authentication to service failed.'));
return false; return false;
} }
public function createHash($url,$hash=null) public function createHash($url, $hash = null)
{ {
$args = $this->args; $args = $this->args;
$args['url'] = $url; $args['url'] = $url;
if (!($response = self::post($this->url_api,$args,true))) if (!($response = self::post($this->url_api, $args, true))) {
{
$this->error->add(__('Service is unavailable.')); $this->error->add(__('Service is unavailable.'));
return false; return false;
} }
$rsp = @simplexml_load_string($response); $rsp = @simplexml_load_string($response);
if ($rsp && $rsp->status == 'success') if ($rsp && $rsp->status == 'success') {
{
$rs = new ArrayObject(); $rs = new ArrayObject();
$rs->hash = $rsp->url[0]->keyword; $rs->hash = $rsp->url[0]->keyword;
$rs->url = $url; $rs->url = $url;
@ -123,4 +120,3 @@ class yourlsKutrlService extends kutrlService
return false; return false;
} }
} }
?>