JcDenis/kUtRL
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

code review

Browse source
This commit is contained in:
Jean-Christian Denis 2023-11-04 18:53:06 +01:00
parent cda97ddad4
commit 7bb71e2de9
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
25 changed files with 395 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Backend.php
View file

@ -39,11 +39,12 @@ class Backend extends Process
'adminPostHeaders' => BackendBehaviors::adminPostHeaders(...),
'adminPostFormItems' => BackendBehaviors::adminPostFormItems(...),
'adminAfterPostUpdate' => BackendBehaviors::adminAfterPostUpdate(...), // update existing short url
'adminAfterPostUpdate' => BackendBehaviors::adminAfterPostCreate(...), // create new short url
'adminAfterPostCreate' => BackendBehaviors::adminAfterPostCreate(...),
'adminBeforePostDelete' => BackendBehaviors::adminBeforePostDelete(...),
'adminPostsActions' => BackendBehaviors::adminPostsActions(...),
]);
// hate duplicate key!
App::behavior()->addBehavior('adminAfterPostUpdate', BackendBehaviors::adminAfterPostCreate(...)); // create new short url
}
App::behavior()->addBehaviors([

41
src/BackendBehaviors.php
View file

@ -51,6 +51,9 @@ class BackendBehaviors
);
}
/**
* @param ArrayObject<string, mixed> $cols
*/
public static function adminColumnsListsV2(ArrayObject $cols): void
{
$cols[My::id()] = [
@ -63,6 +66,9 @@ class BackendBehaviors
];
}
/**
* @param ArrayObject<string, mixed> $sorts
*/
public static function adminFiltersListsV2(ArrayObject $sorts): void
{
$sorts[My::id()] = [
@ -79,12 +85,15 @@ class BackendBehaviors
return My::jsLoad('posts');
}
/**
* @param ArrayObject<string, mixed> $main_items
* @param ArrayObject<string, mixed> $sidebar_items
*/
public static function adminPostFormItems(ArrayObject $main_items, ArrayObject $sidebar_items, ?MetaRecord $post): void
{
$s = My::settings();
if (!$s->get('active')
|| !$s->get('active')
|| null === ($kut = Utils::quickPlace('admin'))
) {
return;
@ -114,7 +123,7 @@ class BackendBehaviors
->for('kutrl_create'),
]);
if ($kut->allow_custom_hash) {
if ($kut->get('allow_custom_hash')) {
$items[] = (new Para())
->class('classic')
->items([
@ -136,7 +145,7 @@ class BackendBehaviors
} else {
$title = sprintf(__('followed %s times'), $count);
}
$href = $kut->url_base . $rs->hash;
$href = $kut->get('url_base') . $rs->hash;
$items[] = (new Para())
->items([
@ -199,11 +208,15 @@ class BackendBehaviors
$kut->remove($old_post_url);
$rs = $kut->hash($new_post_url, '');//$custom); // better to update (not yet implemented)
$url = $kut->url_base . $rs->hash;
if (false === ($rs = $kut->hash($new_post_url, ''))) {
;//$custom); // better to update (not yet implemented)
return;
}
$url = $kut->get('url_base') . $rs->hash;
# ex: Send new url to messengers
if (!empty($rs)) {
if (!$rs->isEmpty()) {
App::behavior()->callBehavior('adminAfterKutrlCreate', $rs, $title);
}
}
@ -224,14 +237,16 @@ class BackendBehaviors
}
$title = Html::escapeHTML($rs->post_title);
$custom = !empty($_POST['kutrl_create_custom']) && $kut->allow_custom_hash ?
$custom = !empty($_POST['kutrl_create_custom']) && $kut->get('allow_custom_hash') ?
$_POST['kutrl_create_custom'] : null;
$rs = $kut->hash($rs->getURL(), $custom);
$url = $kut->url_base . $rs->hash;
if (false === ($rs = $kut->hash($rs->getURL(), $custom))) {
return;
}
$url = $kut->get('url_base') . $rs->hash;
# ex: Send new url to messengers
if (!empty($rs)) {
if (!$rs->isEmpty()) {
App::behavior()->callBehavior('adminAfterKutrlCreate', $rs, $title);
}
}
@ -269,6 +284,9 @@ class BackendBehaviors
);
}
/**
* @param ArrayObject<int|string, int|string> $post
*/
public static function callbackCreate(ActionsPosts $pa, ArrayObject $post): void
{
# No entry
@ -296,6 +314,9 @@ class BackendBehaviors
$pa->redirect(true);
}
/**
* @param ArrayObject<int|string, int|string> $post
*/
public static function callbackDelete(ActionsPosts $pa, ArrayObject $post): void
{
# No entry

7
src/Combo.php
View file

@ -33,8 +33,11 @@ class Combo
{
$services_combo = [];
foreach (Utils::getServices() as $service_id => $service) {
$o = new $service();
$services_combo[__($o->name)] = $o->id;
if (!is_subclass_of($service, Service::class)) {
continue;
}
$o = new $service();
$services_combo[__($o->get('name'))] = $o->get('id');
}
if ($with_none) {
$services_combo = array_merge([__('Disabled') => ''], $services_combo);

23
src/Config.php
View file

@ -82,8 +82,10 @@ class Config extends Process
# services
foreach (Utils::getServices() as $service_id => $service) {
$o = new $service();
$o->saveSettings();
if (is_subclass_of($service, Service::class)) {
$o = new $service();
$o->saveSettings();
}
}
App::blog()->triggerBlog();
@ -148,37 +150,40 @@ class Config extends Process
$i_config = [];
foreach (Utils::getServices() as $service_id => $service) {
if (!is_subclass_of($service, Service::class)) {
continue;
}
$o = new $service();
$s_items = [];
if (!empty($_REQUEST['chk'])) {
$img_chk = $img_red . ' ' . sprintf(__('Failed to test %s API.'), $o->name);
$img_chk = $img_red . ' ' . sprintf(__('Failed to test %s API.'), $o->get('name'));
try {
if ($o->testService()) {
$img_chk = $img_green . ' ' . sprintf(__('%s API is well configured and runing.'), $o->name);
$img_chk = $img_green . ' ' . sprintf(__('%s API is well configured and runing.'), $o->get('name'));
}
} catch (Exception $e) {
App::error()->add(sprintf(__('Failed to test service %s: %s'), $o->name, $e->getMessage()));
App::error()->add(sprintf(__('Failed to test service %s: %s'), $o->get('name'), $e->getMessage()));
}
$s_items[] = (new Text(null, sprintf('<p><em>%s</em></p>', $img_chk) . $o->error->toHTML()));
}
if ($o->home != '') {
if ($o->get('home') != '') {
$s_items[] = (new Para())
->items([
(new Link())
->href($o->home)
->href($o->get('home'))
->title(__('homepage'))
->text(sprintf(__('Learn more about %s.'), $o->name)),
->text(sprintf(__('Learn more about %s.'), $o->get('name'))),
]);
}
$i_config[] = (new Text('hr'));
$i_config[] = (new Div('settings-' . $service_id))
->items([
(new Text('h5', $o->name)),
(new Text('h5', $o->get('name'))),
... $s_items,
$o->settingsForm(),
]);

22
src/FrontendBehaviors.php
View file

@ -17,7 +17,11 @@ use Dotclear\Helper\Html\Html;
*/
class FrontendBehaviors
{
# Disable URL shoretning on filtered tag
/**
* Disable URL shoretning on filtered tag.
*
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function templateBeforeValueV2(string $tag, ArrayObject $attr): ?string
{
if (!empty($attr['disable_kutrl']) && in_array($tag, My::USED_TAGS)) {
@ -27,7 +31,11 @@ class FrontendBehaviors
return null;
}
# Re unable it after tag
/**
* Re unable it after tag.
*
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function templateAfterValueV2(string $tag, ArrayObject $attr): ?string
{
if (!empty($attr['disable_kutrl']) && in_array($tag, My::USED_TAGS)) {
@ -37,7 +45,11 @@ class FrontendBehaviors
return null;
}
# Replace long urls on the fly (on filter) for default tags
/**
* Replace long urls on the fly (on filter) for default tags.
*
* @param array<int|string, mixed> $args The attributes
*/
public static function publicBeforeContentFilterV2(string $tag, array $args): ?string
{
# Unknow tag
@ -66,6 +78,8 @@ class FrontendBehaviors
}
}
}
return null;
}
public static function publicBeforeDocumentV2(): void
@ -85,7 +99,7 @@ class FrontendBehaviors
App::frontend()->context()->kutrl = $kut;
}
public static function publicHeadContent($_): void
public static function publicHeadContent(): void
{
$css = My::settings()->get('srv_local_css');
if (!empty($css)) {

63
src/FrontendTemplate.php
View file

@ -16,6 +16,9 @@ use Dotclear\App;
*/
class FrontendTemplate
{
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function pageURL(ArrayObject$attr): string
{
$f = App::frontend()->template()->getFilters($attr);
@ -23,6 +26,9 @@ class FrontendTemplate
return '<?php echo ' . sprintf($f, 'App::blog()->url().App::url()->getBase("kutrl")') . '; ?>';
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function pageIf(ArrayObject $attr, string $content): string
{
$operator = isset($attr['operator']) ? App::frontend()->template()->getOperator($attr['operator']) : '&&';
@ -41,6 +47,9 @@ class FrontendTemplate
"<?php endif; unset(\$s);?>\n";
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function pageMsgIf(ArrayObject$attr, string $content): string
{
$operator = isset($attr['operator']) ? App::frontend()->template()->getOperator($attr['operator']) : '&&';
@ -59,16 +68,25 @@ class FrontendTemplate
"<?php endif; ?>\n";
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function pageMsg(ArrayObject$attr): string
{
return '<?php echo App::frontend()->context()->kutrl_msg; ?>';
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function humanField(ArrayObject $attr): string
{
return "<?php echo sprintf(__('Confirm by writing \"%s\" in next field:'),App::frontend()->context()->kutrl_hmf); ?>";
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function humanFieldProtect(ArrayObject $attr): string
{
return
@ -76,69 +94,107 @@ class FrontendTemplate
'<?php echo App::nonce()->getFormNonce(); ?>';
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function AttachmentKutrlIf(ArrayObject$attr, string $content): string
{
return self::genericKutrlIf('$attach_f->file_url', $attr, $content);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function AttachmentKutrl(ArrayObject $attr): string
{
return self::genericKutrl('$attach_f->file_url', $attr);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function MediaKutrlIf(ArrayObject$attr, string $content): string
{
return self::genericKutrlIf('App::frontend()->context()->file_url', $attr, $content);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function MediaKutrl(ArrayObject $attr): string
{
return self::genericKutrl('App::frontend()->context()->file_url', $attr);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function EntryAuthorKutrlIf(ArrayObject$attr, string $content): string
{
return self::genericKutrlIf('App::frontend()->context()->posts->user_url', $attr, $content);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function EntryAuthorKutrl(ArrayObject $attr): string
{
return self::genericKutrl('App::frontend()->context()->posts->user_url', $attr);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function EntryKutrlIf(ArrayObject $attr, string $content): string
{
return self::genericKutrlIf('App::frontend()->context()->posts->getURL()', $attr, $content);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function EntryKutrl(ArrayObject $attr): string
{
return self::genericKutrl('App::frontend()->context()->posts->getURL()', $attr);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function CommentAuthorKutrlIf(ArrayObject $attr, string $content): string
{
return self::genericKutrlIf('App::frontend()->context()->comments->getAuthorURL()', $attr, $content);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function CommentAuthorKutrl(ArrayObject $attr): string
{
return self::genericKutrl('App::frontend()->context()->comments->getAuthorURL()', $attr);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function CommentPostKutrlIf(ArrayObject $attr, string $content): string
{
return self::genericKutrlIf('App::frontend()->context()->comments->getPostURL()', $attr, $content);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
public static function CommentPostKutrl(ArrayObject $attr): string
{
return self::genericKutrl('App::frontend()->context()->comments->getPostURL()', $attr);
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
protected static function genericKutrlIf(string $str, ArrayObject $attr, string $content): string
{
$operator = isset($attr['operator']) ? App::fontend()->template()->getOperator($attr['operator']) : '&&';
$operator = isset($attr['operator']) ? App::frontend()->template()->getOperator($attr['operator']) : '&&';
if (isset($attr['is_active'])) {
$sign = (bool) $attr['is_active'] ? '' : '!';
@ -162,6 +218,9 @@ class FrontendTemplate
"<?php endif; ?>\n";
}
/**
* @param ArrayObject<string, mixed> $attr The attributes
*/
protected static function genericKutrl(string $str, ArrayObject $attr): string
{
$f = App::frontend()->template()->getFilters($attr);

26
src/FrontendUrl.php
View file

@ -24,11 +24,9 @@ class FrontendUrl extends Url
# Not active, go to default 404
if (!My::settings()->get('active')) {
self::p404();
return;
}
# Not a valid url, go to kutrl 404
if (!preg_match('#^(|(/(.*?)))$#', $args, $m)) {
if (!preg_match('#^(|(/(.*?)))$#', (string) $args, $m)) {
self::kutrl404();
return;
@ -83,8 +81,6 @@ class FrontendUrl extends Url
# Not active, go to default 404
if (!$s->get('active')) {
self::p404();
return;
}
# Public page not active, go to kutrl 404
if (!$s->get('srv_local_public')) {
@ -99,11 +95,9 @@ class FrontendUrl extends Url
$hmfu = !empty($_POST['hmfp']) ? FrontendUtils::unprotect($_POST['hmfp']) : '?';
$err = false;
if (!$err) {
if ($hmf != $hmfu) {
$err = true;
App::frontend()->context()->kutrl_msg = __('Failed to verify protected field.');
}
if ($hmf != $hmfu) {
$err = true;
App::frontend()->context()->kutrl_msg = __('Failed to verify protected field.');
}
if (!$err) {
if (!$kut->testService()) {
@ -131,7 +125,7 @@ class FrontendUrl extends Url
}
if (!$err) {
if (!$kut->allow_external_url && !$kut->isBlogUrl($url)) {
if (!$kut->get('allow_external_url') && !$kut->isBlogUrl($url)) {
$err = true;
App::frontend()->context()->kutrl_msg = __('Short links are limited to this blog URL.');
}
@ -147,7 +141,7 @@ class FrontendUrl extends Url
$err = true;
$url = $rs->url;
$new_url = $kut->url_base . $rs->hash;
$new_url = $kut->get('url_base') . $rs->hash;
App::frontend()->context()->kutrl_msg = sprintf(
__('Short link for %s is %s'),
@ -162,7 +156,7 @@ class FrontendUrl extends Url
App::frontend()->context()->kutrl_msg = __('Failed to create short link.');
} else {
$url = $rs->url;
$new_url = $kut->url_base . $rs->hash;
$new_url = $kut->get('url_base') . $rs->hash;
App::frontend()->context()->kutrl_msg = sprintf(
__('Short link for %s is %s'),
@ -172,7 +166,7 @@ class FrontendUrl extends Url
App::blog()->triggerBlog();
# ex: Send new url to messengers
if (!empty($rs)) {
if (!$rs->isEmpty()) {
App::behavior()->callBehavior('publicAfterKutrlCreate', $rs, __('New public short URL'));
}
}
@ -185,10 +179,8 @@ class FrontendUrl extends Url
protected static function kutrl404(): void
{
if (!My::settigns()->get('srv_local_404_active')) {
if (!My::settings()->get('srv_local_404_active')) {
self::p404();
return;
}
App::frontend()->template()->appendPath(My::path() . '/default-templates');

8
src/FrontendUtils.php
View file

@ -13,9 +13,9 @@ namespace Dotclear\Plugin\kUtRL;
*/
class FrontendUtils
{
public static $chars = 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789';
public static string $chars = 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789';
public static function create($len = 6)
public static function create(int $len = 6): string
{
$res = '';
$chars = self::$chars;
@ -26,7 +26,7 @@ class FrontendUtils
return $res;
}
public static function protect($str)
public static function protect(string $str): string
{
$res = '';
$chars = self::$chars;
@ -37,7 +37,7 @@ class FrontendUtils
return $res;
}
public static function unprotect($str)
public static function unprotect(string $str): string
{
$res = '';
for ($i = 0; $i < strlen($str); $i++) {

2
src/Install.php
View file

@ -60,7 +60,7 @@ class Install extends Process
);
while ($record->fetch()) {
if (preg_match('/^kutrl_(.*?)$/', $record->setting_id, $match)) {
$cur = App::blogWorkspace()->openBlogWorkspace();
$cur = App::blogWorkspace()->openBlogWorkspaceCursor();
// avoid the use of serialize function
if (in_array($record->setting_id, ['kutrl_srv_custom'])) {
$cur->setting_value = json_encode(@unserialize(base64_decode((string) $record->setting_value)));

16
src/LinksListing.php
View file

@ -49,7 +49,7 @@ class LinksListing extends Listing
}
}
$pager = new Pager((int) $filter->value('page'), $this->rs_count, (int) $filter->nb, 10);
$pager = new Pager((int) $filter->value('page'), (int) $this->rs_count, (int) $filter->value('nb'), 10);
$cols = new ArrayObject([
'kut_url' => (new Text('th', __('Link')))
@ -67,7 +67,7 @@ class LinksListing extends Listing
$lines = [];
while ($this->rs->fetch()) {
$lines[] = $this->linkLine(isset($links[$this->rs->kut_id]));
$lines[] = $this->linkLine(isset($links[$this->rs->f('kut_id')]));
}
echo
@ -103,13 +103,13 @@ class LinksListing extends Listing
if (null !== ($o = Utils::quickService($type))) {
$type = (new Link())
->href($o->home)
->title($o->name)
->text($o->name)
->href($o->get('home'))
->title($o->get('name'))
->text($o->get('name'))
->render();
$hash = (new Link())
->href($o->url_base . $hash)
->title($o->url_base . $hash)
->href($o->get('url_base') . $hash)
->title($o->get('url_base') . $hash)
->text($hash)
->render();
}
@ -125,7 +125,7 @@ class LinksListing extends Listing
->class('maximal')
->items([
(new Link())
->href($o->home)
->href((string) $o?->get('home'))
->title($this->rs->kut_url)
->text($this->rs->kut_url),
]),

33
src/Logs.php
View file

@ -12,6 +12,8 @@ use Dotclear\Database\Statement\{
SelectStatement,
UpdateStatement
};
use Dotclear\Interface\Core\ConnectionInterface;
use Exception;
/**
* @brief kUtRL logs class.
@ -22,8 +24,8 @@ use Dotclear\Database\Statement\{
*/
class Logs
{
public $table;
public $con;
public string $table;
public ConnectionInterface $con;
public function __construct()
{
@ -35,11 +37,12 @@ class Logs
{
$sql = new SelectStatement();
return $sql
$rs = $sql
->column($sql->max('kut_id'))
->from($this->table)
->select()
->f(0) + 1;
->select();
return is_null($rs) || $rs->isEmpty() ? 1 : (int) $rs->f(0) + 1;
}
/**
@ -76,8 +79,6 @@ class Logs
throw $e;
}
return [];
}
/**
@ -110,13 +111,12 @@ class Logs
$sql->and('kut_type = ' . $sql->quote($type));
}
$sql
$rs = $sql
->order('kut_dt DESC')
->limit(1);
->limit(1)
->select();
$rs = $sql->select();
return $rs->isEmpty() ? false : $rs;
return is_null($rs) || $rs->isEmpty() ? false : $rs;
}
public function clear(int $id): bool
@ -141,8 +141,6 @@ class Logs
throw $e;
}
return false;
}
public function delete(int $id): bool
@ -167,7 +165,7 @@ class Logs
->and('kut_id = ' . $id)
->select();
$counter = $rs->isEmpty() ? 0 : (int) $rs->kut_counter;
$counter = is_null($rs) || $rs->isEmpty() ? 0 : (int) $rs->kut_counter;
if ('get' == $do) {
return $counter;
@ -190,6 +188,9 @@ class Logs
return $counter;
}
/**
* @param array<string, mixed> $params
*/
public function getLogs(array $params, bool $count_only = false): MetaRecord
{
$sql = new SelectStatement();
@ -259,6 +260,6 @@ class Logs
$sql->limit($params['limit']);
}
return $sql->select();
return $sql->select() ?? MetaRecord::newFromArray([]);
}
}

22
src/Manage.php
View file

@ -21,6 +21,7 @@ use Dotclear\Helper\Html\Form\{
Text,
};
use Dotclear\Helper\Html\Html;
use Exception;
/**
* @brief kUtRL manage class.
@ -65,7 +66,7 @@ class Manage extends Process
if (!$kut->testService()) {
throw new Exception(__('Service is not well configured.'));
}
if (null !== $hash && !$kut->allow_custom_hash) {
if (null !== $hash && !$kut->get('allow_custom_hash')) {
throw new Exception(__('This service does not allowed custom hash.'));
}
if (!$kut->isValidUrl($url)) {
@ -77,7 +78,7 @@ class Manage extends Process
if (!$kut->isProtocolUrl($url)) {
throw new Exception(__('This type of link is not allowed.'));
}
if (!$kut->allow_external_url && !$kut->isBlogUrl($url)) {
if (!$kut->get('allow_external_url') && !$kut->isBlogUrl($url)) {
throw new Exception(__('Short links are limited to this blog URL.'));
}
if ($kut->isServiceUrl($url)) {
@ -88,7 +89,7 @@ class Manage extends Process
}
if (false !== ($rs = $kut->isKnowUrl($url))) {
$url = $rs->url;
$new_url = $kut->url_base . $rs->hash;
$new_url = $kut->get('url_base') . $rs->hash;
Notices::addSuccessNotice(sprintf(
__('Short link for %s is %s'),
@ -104,7 +105,7 @@ class Manage extends Process
throw new Exception(__('Failed to create short link. This could be caused by a service failure.'));
} else {
$url = $rs->url;
$new_url = $kut->url_base . $rs->hash;
$new_url = $kut->get('url_base') . $rs->hash;
Notices::addSuccessNotice(sprintf(
__('Short link for %s is %s'),
@ -113,7 +114,7 @@ class Manage extends Process
));
# ex: Send new url to messengers
if (!empty($rs)) {
if (!$rs->isEmpty()) {
App::behavior()->callBehavior('adminAfterKutrlCreate', $rs, __('New short URL'));
}
}
@ -149,14 +150,13 @@ class Manage extends Process
]) .
Notices::getNotices();
if (!isset($kut) || null === $kut) {
echo (new Para())
->text(__('You must set an admin service.'))
if (null === $kut) {
echo (new Text('p', __('You must set an admin service.')))
->render();
} else {
$fields = [];
if ($kut->allow_custom_hash) {
if ($kut->get('allow_custom_hash')) {
$fields[] = (new Para())
->items([
(new Label(__('Custom short link:'), Label::OUTSIDE_LABEL_BEFORE))
@ -170,7 +170,7 @@ class Manage extends Process
->class('form-note')
->text(__('Only if you want a custom short link.'));
if ($kut->admin_service == 'local') {
if ($kut->get('admin_service') == 'local') {
$fields[] = (new Note())
->class('form-note')
->text(__('You can use "bob!!" if you want a semi-custom link, it starts with "bob" and "!!" will be replaced by an increment value.'));
@ -179,7 +179,7 @@ class Manage extends Process
echo (new Div())
->items([
(new Text('h4', sprintf(__('Shorten link using service "%s"'), $kut->name))),
(new Text('h4', sprintf(__('Shorten link using service "%s"'), $kut->get('name')))),
(new Form('create-link'))
->method('post')
->action(My::manageUrl())

3
src/ManageLinks.php
View file

@ -23,6 +23,7 @@ use Dotclear\Helper\Html\Form\{
Submit,
Text
};
use Exception;
/**
* @brief kUtRL manage links class.
@ -34,7 +35,7 @@ use Dotclear\Helper\Html\Form\{
class ManageLinks extends Process
{
private static Filters $kutrl_filter;
private static Linkslisting $kutrl_listing;
private static LinksListing $kutrl_listing;
public static function init(): bool
{

2
src/My.php
View file

@ -25,7 +25,7 @@ class My extends MyPlugin
/**
* List of template tag which content URL that can be shorten.
*
* @var array USED_TAGS
* @var array<int, string> USED_TAGS
*/
public const USED_TAGS = [
'AttachmentURL',

59
src/Service.php
View file

@ -21,10 +21,24 @@ use Dotclear\Helper\Network\HttpClient;
*/
class Service
{
/**
* @var \Dotclear\Interface\Core\ErrorInterface $error
*/
public $error;
/**
* @var \Dotclear\Interface\Core\BlogWorkspaceInterface $settings
*/
public $settings;
/**
* @var Logs $log
*/
public $log;
/**
* @var array<string, mixed> $config
*/
protected $config = [];
public function __construct()
@ -37,7 +51,7 @@ class Service
$this->init();
// Force setting
$allow_external_url = $this->settings?->get('allow_external_url');
$allow_external_url = $this->settings->get('allow_external_url');
$this->config['allow_external_url'] = null === $allow_external_url ?
true : $allow_external_url;
@ -60,14 +74,22 @@ class Service
);
}
# Magic get for config values
public function __get($k)
/**
* Magic get for config values.
*
* @return mixed
*/
public function __get(string $k)
{
return $this->get($k);
}
# get config value
public function get($k)
/**
* Get config value.
*
* @return mixed
*/
public function get(string $k)
{
return $this->config[$k] ?? null;
}
@ -110,19 +132,19 @@ class Service
# Test if an url contents know prefix
public function isServiceUrl(string $url): bool
{
return strpos($url, $this->url_base) === 0;
return strpos($url, $this->get('url_base')) === 0;
}
# Test if an url is long enoutgh
public function isLongerUrl(string $url): bool
{
return (strlen($url) >= (int) $this->url_min_len);
return (strlen($url) >= (int) $this->get('url_min_len'));
}
# Test if an url protocol (eg: http://) is allowed
public function isProtocolUrl(string $url): bool
{
foreach ($this->allow_protocols as $protocol) {
foreach ($this->get('allow_protocols') as $protocol) {
if (empty($protocol)) {
continue;
}
@ -150,7 +172,7 @@ class Service
*/
public function isKnowUrl(string $url)
{
return $this->log->select($url, null, $this->id, 'kutrl');
return $this->log->select($url, null, $this->get('id'), 'kutrl');
}
/**
@ -160,7 +182,7 @@ class Service
*/
public function isKnowHash(string $hash)
{
return $this->log->select(null, $hash, $this->id, 'kutrl');
return $this->log->select(null, $hash, $this->get('id'), 'kutrl');
}
/**
@ -171,10 +193,10 @@ class Service
public function hash(string $url, ?string $hash = null)
{
$url = trim(App::con()->escapeStr((string) $url));
if ('undefined' === $this->id) {
if ('undefined' === $this->get('id')) {
return false;
}
if ($hash && !$this->allow_custom_hash) {
if ($hash && !$this->get('allow_custom_hash')) {
return false;
}
if ($this->isServiceUrl($url)) {
@ -183,7 +205,7 @@ class Service
if (!$this->isLongerUrl($url)) {
return false;
}
if (!$this->allow_external_url && $this->isBlogUrl($url)) {
if (!$this->get('allow_external_url') && $this->isBlogUrl($url)) {
return false;
}
if ($hash && false !== ($rs = $this->isKnowHash($hash))) {
@ -262,14 +284,21 @@ class Service
/**
* Post request.
*
* @param array<int, string> $headers
* @return mixed
*/
public static function post(string $url, $data, bool $verbose = true, bool $get = false, $headers = [])
public static function post(string $url, mixed $data, bool $verbose = true, bool $get = false, array $headers = [])
{
$client = HttpClient::initClient($url, $url);
if (false === $client) {
return false;
}
$client->setUserAgent('kUtRL - https://github.com/JcDenis/kUtRL');
$client->setPersistReferers(false);
if (is_array($headers) && !empty($headers)) {
if (!empty($headers)) {
foreach ($headers as $header) {
$client->setMoreHeader($header);
}

34
src/Service/ServiceBilbolinks.php
View file

@ -7,7 +7,7 @@ namespace Dotclear\Plugin\kUtRL\Service;
use Dotclear\Helper\Html\Form\{
Div,
Input,
label,
Label,
Note,
Para
};
@ -22,21 +22,22 @@ use Dotclear\Plugin\kUtRL\Service;
*/
class ServiceBilbolinks extends Service
{
protected $config = [
'id' => 'bilbolinks',
'name' => 'BilboLinks',
'home' => 'http://www.tux-planet.fr/bilbobox/',
];
protected function init(): void
{
$base = (string) $this->settings->get('srv_bilbolinks_base');
if (!empty($base) && substr($base, -1, 1) != '/') {
$base .= '/';
}
$this->config['url_api'] = $base . 'api.php';
$this->config['url_base'] = $base;
$this->config['url_min_len'] = 25;
$this->config = [
'id' => 'bilbolinks',
'name' => 'BilboLinks',
'home' => 'http://www.tux-planet.fr/bilbobox/',
'url_api' => $base . 'api.php',
'url_base' => $base,
'url_min_len' => 25,
];
}
public function saveSettings(): void
@ -72,14 +73,14 @@ class ServiceBilbolinks extends Service
public function testService(): bool
{
if (empty($this->url_base)) {
if (empty($this->get('url_base'))) {
$this->error->add(__('Service is not well configured.'));
return false;
}
$arg = ['longurl' => urlencode($this->url_test)];
if (!self::post($this->url_api, $arg, true, true)) {
$arg = ['longurl' => urlencode($this->get('url_test'))];
if (!self::post($this->get('url_api'), $arg, true, true)) {
$this->error->add(__('Service is unavailable.'));
return false;
@ -92,7 +93,7 @@ class ServiceBilbolinks extends Service
{
$arg = ['longurl' => $url];
if (!($response = self::post($this->url_api, $arg, true, true))) {
if (!($response = self::post($this->get('url_api'), $arg, true, true))) {
$this->error->add(__('Service is unavailable.'));
return false;
@ -102,10 +103,11 @@ class ServiceBilbolinks extends Service
return false;
}
return $this->fromValue(
str_replace($this->url_base, '', $response),
(string) str_replace($this->get('url_base'), '', $response),
$url,
$this->id
$this->get('id')
);
}
}

40
src/Service/ServiceBitly.php
View file

@ -7,7 +7,7 @@ namespace Dotclear\Plugin\kUtRL\Service;
use Dotclear\Helper\Html\Form\{
Div,
Input,
label,
Label,
Note,
Para
};
@ -22,24 +22,27 @@ use Dotclear\Plugin\kUtRL\Service;
*/
class ServiceBitly extends Service
{
protected $config = [
'id' => 'bitly',
'name' => 'bit.ly',
'home' => 'https://bit.ly',
'url_api' => 'https://api-ssl.bitly.com/v4/',
'url_base' => 'https://bit.ly/',
'url_min_len' => 25,
'allow_protocols' => ['http://', 'https://'],
];
/**
* @var array<string, mixed> $args
*/
private $args = [
'apiKey' => '',
];
protected function init(): void
{
$this->config = [
'id' => 'bitly',
'name' => 'bit.ly',
'home' => 'https://bit.ly',
'url_api' => 'https://api-ssl.bitly.com/v4/',
'url_base' => 'https://bit.ly/',
'url_min_len' => 25,
'allow_protocols' => ['http://', 'https://'],
];
$this->args['apiKey'] = $this->settings->get('srv_bitly_apikey');
}
@ -76,7 +79,7 @@ class ServiceBitly extends Service
}
$args = json_encode(['domain' => 'bit.ly', 'bitlink_id' => 'bit.ly/WP9vc'], JSON_UNESCAPED_SLASHES);
if (!($response = self::post($this->url_api . 'expand', $args, true, false, $this->headers()))) {
if (!($response = self::post($this->get('url_api') . 'expand', $args, true, false, $this->headers()))) {
$this->error->add(__('Failed to call service.'));
return false;
@ -89,7 +92,7 @@ class ServiceBitly extends Service
{
$args = json_encode(['domain' => 'bit.ly', 'long_url' => $url]);
if (!($response = self::post($this->url_api . 'shorten', $args, true, false, $this->headers()))) {
if (!($response = self::post($this->get('url_api') . 'shorten', $args, true, false, $this->headers()))) {
$this->error->add(__('Failed to call service.'));
return false;
@ -98,12 +101,15 @@ class ServiceBitly extends Service
$rsp = json_decode($response);
return $this->fromValue(
str_replace($this->url_base, '', (string) $rsp->link),
str_replace($this->get('url_base'), '', (string) $rsp->link),
(string) $rsp->long_url,
$this->id
$this->get('id')
);
}
/**
* @return array<int, string>
*/
private function headers()
{
return ['Authorization: Bearer ' . $this->args['apiKey'], 'Content-Type: application/json'];

55
src/Service/ServiceCustom.php
View file

@ -10,7 +10,8 @@ use Dotclear\Helper\Html\Form\{
Input,
Label,
Note,
Para
Para,
Text
};
use Dotclear\Plugin\kUtRL\Service;
@ -23,11 +24,6 @@ use Dotclear\Plugin\kUtRL\Service;
*/
class ServiceCustom extends Service
{
protected $config = [
'id' => 'custom',
'name' => 'Custom',
];
protected function init(): void
{
$config = json_decode((string) $this->settings->get('srv_custom'), true);
@ -35,12 +31,17 @@ class ServiceCustom extends Service
$config = [];
}
$this->config['url_api'] = $config['url_api'] ?? '';
$this->config['url_base'] = $config['url_base'] ?? '';
$this->config['url_param'] = $config['url_param'] ?? '';
$this->config['url_encode'] = !empty($config['url_api']);
$this->config = [
'id' => 'custom',
'name' => 'Custom',
$this->config['url_min_length'] = strlen($this->url_base) + 2;
'url_api' => $config['url_api'] ?? '',
'url_base' => $config['url_base'] ?? '',
'url_param' => $config['url_param'] ?? '',
'url_encode' => !empty($config['url_api']),
'url_min_length' => strlen($config['url_base'] ?? '') + 2,
];
}
public function saveSettings(): void
@ -70,13 +71,13 @@ class ServiceCustom extends Service
return (new Div())
->items([
(new Para())
->text(
__('You can set a configurable service.') . '<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 returned the short URL (or only hash) in clear text.')
),
(new Text(
'p',
__('You can set a configurable service.') . '<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 returned the short URL (or only hash) in clear text.')
)),
(new Para())
->items([
(new Label(__('API URL:'), Label::OUTSIDE_LABEL_BEFORE))
@ -126,12 +127,12 @@ class ServiceCustom extends Service
public function testService(): bool
{
if (empty($this->url_api)) {
if (empty($this->get('url_api'))) {
return false;
}
$url = $this->url_encode ? urlencode($this->url_test) : $this->url_test;
$arg = [$this->url_param => $url];
if (!self::post($this->url_api, $arg, true, true)) {
$url = $this->get('url_encode') ? urlencode($this->get('url_test')) : $this->get('url_test');
$arg = [$this->get('url_param') => $url];
if (!self::post($this->get('url_api'), $arg, true, true)) {
$this->error->add(__('Service is unavailable.'));
return false;
@ -142,19 +143,19 @@ class ServiceCustom extends Service
public function createHash(string $url, ?string $hash = null)
{
$enc = $this->url_encode ? urlencode($url) : $url;
$arg = [$this->url_param => $enc];
$enc = $this->get('url_encode') ? urlencode($url) : $url;
$arg = [$this->get('url_param') => $enc];
if (!($response = self::post($this->url_api, $arg, true, true))) {
if (!($response = self::post($this->get('url_api'), $arg, true, true))) {
$this->error->add(__('Service is unavailable.'));
return false;
}
return $this->fromValue(
str_replace($this->url_base, '', $response),
(string) str_replace($this->get('url_base'), '', $response),
$url,
$this->id
$this->get('id')
);
}
}

20
src/Service/ServiceDefault.php
View file

@ -7,7 +7,6 @@ namespace Dotclear\Plugin\kUtRL\Service;
use Dotclear\Helper\Html\Form\{
Div,
Note,
Para,
Text
};
use Dotclear\Plugin\kUtRL\Service;
@ -49,8 +48,7 @@ class ServiceDefault extends Service
(new Note())
->class('form-note')
->text(__('There is nothing to configure for this service.')),
(new Para())
->text(__('There is nothing to configure for this service.')),
(new Text('p', __('There is nothing to configure for this service.'))),
(new Text(
'',
'<dl>' .
@ -71,10 +69,10 @@ class ServiceDefault extends Service
public function testService(): bool
{
$url = $this->url_encode ? urlencode($this->url_test) : $this->url_test;
$arg = [$this->url_param => urlencode($this->url_test)];
$url = $this->get('url_encode') ? urlencode($this->get('url_test')) : $this->get('url_test');
$arg = [$this->get('url_param') => urlencode($this->get('url_test'))];
if (!self::post($this->url_api, $arg, true, true)) {
if (!self::post($this->get('url_api'), $arg, true, true)) {
$this->error->add(__('Service is unavailable.'));
return false;
@ -85,19 +83,19 @@ class ServiceDefault extends Service
public function createHash(string $url, ?string $hash = null)
{
$enc = $this->url_encode ? urlencode($url) : $url;
$arg = [$this->url_param => $url];
$enc = $this->get('url_encode') ? urlencode($url) : $url;
$arg = [$this->get('url_param') => $url];
if (!($response = self::post($this->url_api, $arg, true, true))) {
if (!($response = self::post($this->get('url_api'), $arg, true, true))) {
$this->error->add(__('Service is unavailable.'));
return false;
}
return $this->fromValue(
str_replace($this->url_base, '', $response),
(string) str_replace($this->get('url_base'), '', $response),
$url,
$this->id
$this->get('id')
);
}
}

29
src/Service/ServiceIsgd.php
View file

@ -15,20 +15,23 @@ use Dotclear\Plugin\kUtRL\Service;
*/
class ServiceIsgd extends Service
{
protected $config = [
'id' => 'isgd',
'name' => 'is.gd',
'home' => 'http://is.gd/',
protected function init(): void
{
$this->config = [
'id' => 'isgd',
'name' => 'is.gd',
'home' => 'http://is.gd/',
'url_api' => 'http://is.gd/api.php',
'url_base' => 'http://is.gd/',
'url_min_length' => 25,
];
'url_api' => 'http://is.gd/api.php',
'url_base' => 'http://is.gd/',
'url_min_length' => 25,
];
}
public function testService(): bool
{
$arg = ['longurl' => urlencode($this->url_test)];
if (!self::post($this->url_api, $arg, true, true)) {
$arg = ['longurl' => urlencode($this->get('url_test'))];
if (!self::post($this->get('url_api'), $arg, true, true)) {
$this->error->add(__('Service is unavailable.'));
return false;
@ -41,16 +44,16 @@ class ServiceIsgd extends Service
{
$arg = ['longurl' => $url];
if (!($response = self::post($this->url_api, $arg, true, true))) {
if (!($response = self::post($this->get('url_api'), $arg, true, true))) {
$this->error->add(__('Service is unavailable.'));
return false;
}
return $this->fromValue(
str_replace($this->url_base, '', $response),
(string) str_replace($this->get('url_base'), '', $response),
$url,
$this->id
$this->get('id')
);
}
}

57
src/Service/ServiceLocal.php
View file

@ -17,6 +17,7 @@ use Dotclear\Helper\Html\Form\{
};
use Dotclear\Helper\Html\Html;
use Dotclear\Plugin\kUtRL\Service;
use Exception;
/**
* @brief kUtRL local service class.
@ -27,21 +28,21 @@ use Dotclear\Plugin\kUtRL\Service;
*/
class ServiceLocal extends Service
{
protected $config = [
'id' => 'local',
'name' => 'kUtRL',
'home' => 'https://github.com/JcDenis/kUtRL',
'allow_custom_hash' => true,
];
protected function init(): void
{
$protocols = (string) $this->settings->get('srv_local_protocols');
$this->config['allow_protocols'] = empty($protocols) ? [] : explode(',', $protocols);
$protocols = (string) $this->settings->get('srv_local_protocols');
$this->config['url_base'] = App::blog()->url() . App::url()->getBase('kutrl') . '/';
$this->config['url_min_len'] = strlen($this->url_base) + 2;
$this->config = [
'id' => 'local',
'name' => 'kUtRL',
'home' => 'https://github.com/JcDenis/kUtRL',
'allow_custom_hash' => true,
'allow_protocols' => empty($protocols) ? [] : explode(',', $protocols),
'url_base' => App::blog()->url() . App::url()->getBase('kutrl') . '/',
'url_min_len' => strlen(App::blog()->url() . App::url()->getBase('kutrl') . '/') + 2,
];
}
public function saveSettings(): void
@ -115,13 +116,13 @@ class ServiceLocal extends Service
(new Text(
'p',
__('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->get('url_base'))
)),
(new Text(
'p',
__("You can use Dotclear's plugin called myUrlHandlers to change short links prefix on your blog.") .
(
preg_match('/index\.php/', $this->url_base) ?
preg_match('/index\.php/', $this->get('url_base')) ?
' ' .
__("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">' .
@ -143,7 +144,7 @@ class ServiceLocal extends Service
public function testService(): bool
{
$ap = $this->allow_protocols;
$ap = $this->get('allow_protocols');
if (!empty($ap)) {
return true;
}
@ -161,13 +162,13 @@ class ServiceLocal extends Service
# Normal link
if ($hash === null) {
$type = 'localnormal';
$type = 'localnormal';
$rs_hash = $this->next($this->last('localnormal'));
# Mixed custom link
} elseif (preg_match('/^([A-Za-z0-9]{2,})\!\!$/', $hash, $m)) {
$type = 'localmix';
$rs_hash = $m[1] . $this->next(-1, $m[1]);
$type = 'localmix';
$rs_hash = $m[1] . $this->next('-1', $m[1]);
# Custom link
} elseif (preg_match('/^[A-Za-z0-9\.\-\_]{2,}$/', $hash)) {
@ -176,7 +177,7 @@ class ServiceLocal extends Service
return false;
}
$type = 'localcustom';
$type = 'localcustom';
$rs_hash = $hash;
# Wrong char in custom hash
@ -195,23 +196,23 @@ class ServiceLocal extends Service
$rs_url,
$rs_type
);
} catch (Exception $e) {
} catch (Exception) {
$this->error->add(__('Failed to save link.'));
}
return false;
}
protected function last($type)
protected function last(string $type): string
{
return false === ($rs = $this->log->select(null, null, $type, 'local')) ?
-1 : $rs->hash;
'-1' : $rs->hash;
}
protected function next($last_id, $prefix = '')
protected function next(string $last_id, string $prefix = ''): string
{
if ($last_id == -1) {
$next_id = 0;
if ($last_id == '-1') {
$next_id = '0';
} else {
for ($x = 1; $x <= strlen($last_id); $x++) {
$pos = strlen($last_id) - $x;
@ -231,7 +232,7 @@ class ServiceLocal extends Service
$next_id : $this->next($next_id, $prefix);
}
protected function append($id)
protected function append(string $id): string
{
$id = str_split($id);
for ($x = 0; $x < count($id); $x++) {
@ -241,7 +242,7 @@ class ServiceLocal extends Service
return implode($id) . '0';
}
protected function increment($id, $pos)
protected function increment(string $id, int $pos): string
{
$id = str_split($id);
$char = $id[$pos];
@ -262,7 +263,7 @@ class ServiceLocal extends Service
return implode($id);
}
public function getUrl(string $hash)
public function getUrl(string $hash): bool|string
{
if (false === ($rs = $this->log->select(null, $hash, null, 'local'))) {
return false;

29
src/Service/ServiceYourls.php
View file

@ -22,12 +22,9 @@ use Dotclear\Plugin\kUtRL\Service;
*/
class ServiceYourls extends Service
{
protected $config = [
'id' => 'yourls',
'name' => 'YOURLS',
'home' => 'http://yourls.org',
];
/**
* @var array<string, string> $args
*/
private $args = [
'username' => '',
'password' => '',
@ -43,9 +40,15 @@ class ServiceYourls extends Service
$base = (string) $this->settings->get('srv_yourls_base');
//if (!empty($base) && substr($base,-1,1) != '/') $base .= '/';
$this->config['url_api'] = $base;
$this->config['url_base'] = $base;
$this->config['url_min_len'] = strlen($base) + 3;
$this->config = [
'id' => 'yourls',
'name' => 'YOURLS',
'home' => 'http://yourls.org',
'url_api' => $base,
'url_base' => $base,
'url_min_len' => strlen($base) + 3,
];
}
public function saveSettings(): void
@ -108,9 +111,9 @@ class ServiceYourls extends Service
}
$args = $this->args;
$args['url'] = $this->url_test;
$args['url'] = $this->get('url_test');
if (!($response = self::post($this->url_api, $this->args, true))) {
if (!($response = self::post($this->get('url_api'), $this->args, true))) {
$this->error->add(__('Service is unavailable.'));
return false;
@ -129,7 +132,7 @@ class ServiceYourls extends Service
{
$args = array_merge($this->args, ['url' => $url]);
if (!($response = self::post($this->url_api, $args, true))) {
if (!($response = self::post($this->get('url_api'), $args, true))) {
$this->error->add(__('Service is unavailable.'));
return false;
@ -141,7 +144,7 @@ class ServiceYourls extends Service
return $this->fromValue(
$rsp->url[0]->keyword,
$url,
$this->id
$this->get('id')
);
}
$this->error->add(__('Unreadable service response.'));

18
src/Utils.php
View file

@ -21,7 +21,7 @@ class Utils
*
* @return array<string,string> The services list
*/
public static function getServices(): ?array
public static function getServices(): array
{
$list = App::behavior()->getBehavior('kutrlService');
@ -54,7 +54,7 @@ class Utils
return null;
}
$services = self::getServices();
if (isset($services[$id])) {
if (isset($services[$id]) && is_subclass_of($services[$id], Service::class)) {
return new $services[$id]();
}
} catch (Exception $e) {
@ -66,9 +66,9 @@ class Utils
/**
* Silently try to load a service according to its place.
*
* @param string The execution context
* @param string $place The execution context
*
* @return Service The service or null on error
* @return null|Service The service or null on error
*/
public static function quickPlace(string $place = 'plugin'): ?Service
{
@ -89,11 +89,11 @@ class Utils
/**
* Silently try to reduce url (using 'plugin' place).
*
* @param string $url The long URL
* @param string $cutom The custom short URI
* @param string $place The context
* @param string $url The long URL
* @param string $custom The custom short URI
* @param string $place The context
*
* @return string The short url on success else the long url
* @return string The short url on success else the long url
*/
public static function quickReduce(string $url, ?string $custom = null, string $place = 'plugin'): string
{
@ -107,7 +107,7 @@ class Utils
return $url;
}
return $srv->url_base . $rs->hash;
return $srv->get('url_base') . $rs->hash;
} catch (Exception $e) {
}

30
src/Widgets.php
View file

@ -177,23 +177,23 @@ class Widgets
return '';
}
$type = in_array($w->type, ['localnormal', 'localmix', 'localcustom']) ?
"AND kut_type ='" . $w->type . "' " :
$type = in_array($w->get('type'), ['localnormal', 'localmix', 'localcustom']) ?
"AND kut_type ='" . $w->get('type') . "' " :
'AND kut_type ' . App::con()->in(['localnormal', 'localmix', 'localcustom']) . ' ';
$hide = (bool) $w->hideempty ? 'AND kut_counter > 0 ' : '';
$hide = (bool) $w->get('hideempty') ? 'AND kut_counter > 0 ' : '';
$more = '';
if ($w->type == 'localmix' && '' != $w->mixprefix) {
$more = "AND kut_hash LIKE '" . App::con()->escapeStr((string) $w->mixprefix) . "%' ";
if ($w->get('type') == 'localmix' && '' != $w->get('mixprefix')) {
$more = "AND kut_hash LIKE '" . App::con()->escapeStr((string) $w->get('mixprefix')) . "%' ";
}
$order = ($w->sortby && in_array($w->sortby, ['kut_dt', 'kut_counter', 'kut_hash'])) ?
$w->sortby : 'kut_dt';
$order = ($w->get('sortby') && in_array($w->get('sortby'), ['kut_dt', 'kut_counter', 'kut_hash'])) ?
$w->get('sortby') : 'kut_dt';
$order .= $w->sort == 'desc' ? ' DESC' : ' ASC';
$order .= $w->get('sort') == 'desc' ? ' DESC' : ' ASC';
$limit = App::con()->limit(abs((int) $w->limit));
$limit = App::con()->limit(abs((int) $w->get('limit')));
$rs = App::con()->select(
'SELECT kut_counter, kut_hash ' .
@ -215,16 +215,12 @@ class Widgets
$hash = $rs->kut_hash;
$url = App::blog()->url() . App::url()->getBase('kutrl') . '/' . $hash;
$cut_len = - abs((int) $w->urllen);
$cut_len = abs((int) $w->get('urllen'));
if (strlen($url) > $cut_len) {
$url = '...' . substr($url, $cut_len);
$url = '...' . substr($url, 0, $cut_len);
}
/*
if (strlen($hash) > $cut_len) {
$url = '...'.substr($hash, $cut_len);
}
//*/
if ($rs->kut_counter == 0) {
$counttext = __('never followed');
} elseif ($rs->kut_counter == 1) {
@ -239,7 +235,7 @@ class Widgets
str_replace(
['%rank%', '%hash%', '%url%', '%count%', '%counttext%'],
[$rank, $hash, $url, $rs->kut_counter, $counttext],
$w->text
$w->get('text')
) .
'</a></li>';
}

10
src/Wiki.php
View file

@ -21,14 +21,14 @@ class Wiki
# Do nothing on comment preview and post preview
if (!empty($_POST['preview'])
|| (App::task()->checkContext('FRONTEND') && App::frontend()->context()->preview)
|| !My::settings()?->get('active')
|| !My::settings()->get('active')
) {
return;
}
if (null === ($kut = Utils::quickPlace('wiki'))) {
return;
}
foreach ($kut->allow_protocols as $protocol) {
foreach ($kut->get('allow_protocols') as $protocol) {
$wiki2xhtml->registerFunction(
'url:' . $protocol,
self::transform(...)
@ -41,7 +41,7 @@ class Wiki
*/
public static function transform(string $url, string $content): ?array
{
if (!My::settings()?->get('active')) {
if (!My::settings()->get('active')) {
return null;
}
if (null === ($kut = Utils::quickPlace('wiki'))) {
@ -59,8 +59,8 @@ class Wiki
}
$res = [];
$testurl = strlen($rs->url) > 35 ? substr($rs->url, 0, 35) . '...' : $rs->url;
$res['url'] = $kut->url_base . $rs->hash;
$res['title'] = sprintf(__('%s (Shorten with %s)'), $rs->url, __($kut->name));
$res['url'] = $kut->get('url_base') . $rs->hash;
$res['title'] = sprintf(__('%s (Shorten with %s)'), $rs->url, __($kut->get('name')));
if ($testurl == $content) {
$res['content'] = $res['url'];
}