PsychoticNinja/Stikked
1
0
Fork 0
mirror of https://github.com/claudehohl/Stikked.git synced 2025-04-26 13:01:08 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #362 from techjwalker/patch-1

Browse Source 
YOURLS support. Issue #358
This commit is contained in:
Claude 2016-06-06 10:38:59 +02:00
commit 03f89fcf64
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/application/models/Pastes.php
View File

@ -289,6 +289,16 @@ class Pastes extends CI_Model
$config_yourls_url = $this->config->item('yourls_url'); $config_yourls_url = $this->config->item('yourls_url');
$config_yourls_signature = $this->config->item('yourls_signature'); $config_yourls_signature = $this->config->item('yourls_signature');
$timestamp = time(); $timestamp = time();
// grab title to avoid 404s in yourls
if ($this->input->post('title'))
{
$yourl_title = htmlspecialchars($this->input->post('title'));
}
else
{
$yourl_title = $this->config->item('unknown_title');
}
$prep_data = array( $prep_data = array(
CURLOPT_URL => $config_yourls_url . 'yourls-api.php', CURLOPT_URL => $config_yourls_url . 'yourls-api.php',
CURLOPT_RETURNTRANSFER => true, CURLOPT_RETURNTRANSFER => true,
@ -297,6 +307,7 @@ class Pastes extends CI_Model
'url' => $url, 'url' => $url,
'format' => 'simple', 'format' => 'simple',
'action' => 'shorturl', 'action' => 'shorturl',
'title' => $yourl_title,
'signature' => md5($timestamp . $config_yourls_signature) , 'signature' => md5($timestamp . $config_yourls_signature) ,
'timestamp' => $timestamp 'timestamp' => $timestamp
) )
@ -378,6 +389,15 @@ class Pastes extends CI_Model
//use yourls //use yourls
$config_yourls_signature = $this->config->item('yourls_signature'); $config_yourls_signature = $this->config->item('yourls_signature');
$timestamp = time(); $timestamp = time();
// grab title to avoid 404s in yourls
if ($this->input->post('title'))
{
$yourl_title = htmlspecialchars($this->input->post('title'));
}
else
{
$yourl_title = $this->config->item('unknown_title');
}
$prep_data = array( $prep_data = array(
CURLOPT_URL => $config_yourls_url . 'yourls-api.php', CURLOPT_URL => $config_yourls_url . 'yourls-api.php',
CURLOPT_RETURNTRANSFER => true, CURLOPT_RETURNTRANSFER => true,
@ -386,6 +406,7 @@ class Pastes extends CI_Model
'url' => $url, 'url' => $url,
'format' => 'simple', 'format' => 'simple',
'action' => 'shorturl', 'action' => 'shorturl',
'title' => $yourl_title,
'signature' => md5($timestamp . $config_yourls_signature) , 'signature' => md5($timestamp . $config_yourls_signature) ,
'timestamp' => $timestamp 'timestamp' => $timestamp
) )