Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codeignitor 3.1.6 and corresponding changes

Browse Source 
- fixes missing () from num_rows in authenticate user function
- removes passwordhash library in favor of built in PHP password_hash
  and password_verify functions
- uppercase all class filenames
- add new CLI error templates, move HTML error templates
- update mimes file to latest version
- update routes to latest version
This commit is contained in:
Warren Volz
2017-11-07 00:45:06 +00:00
parent 39f4e83e09
commit e384826aea
266 changed files with 45274 additions and 23853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

324
system/libraries/Trackback.php
View File

@@ -1,19 +1,41 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
<?php
/**
* CodeIgniter
*
* An open source application development framework for PHP 5.1.6 or newer
* An open source application development framework for PHP
*
* @package CodeIgniter
* @author ExpressionEngine Dev Team
* @copyright Copyright (c) 2008 - 2011, EllisLab, Inc.
* @license http://codeigniter.com/user_guide/license.html
* @link http://codeigniter.com
* @since Version 1.0
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014 - 2017, British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 1.0.0
* @filesource
*/
// ------------------------------------------------------------------------
defined('BASEPATH') OR exit('No direct script access allowed');
/**
* Trackback Class
@@ -23,26 +45,65 @@
* @package CodeIgniter
* @subpackage Libraries
* @category Trackbacks
* @author ExpressionEngine Dev Team
* @link http://codeigniter.com/user_guide/libraries/trackback.html
* @author EllisLab Dev Team
* @link https://codeigniter.com/user_guide/libraries/trackback.html
*/
class CI_Trackback {
var $time_format = 'local';
var $charset = 'UTF-8';
var $data = array('url' => '', 'title' => '', 'excerpt' => '', 'blog_name' => '', 'charset' => '');
var $convert_ascii = TRUE;
var $response = '';
var $error_msg = array();
/**
* Character set
*
* @var string
*/
public $charset = 'UTF-8';
/**
* Trackback data
*
* @var array
*/
public $data = array(
'url' => '',
'title' => '',
'excerpt' => '',
'blog_name' => '',
'charset' => ''
);
/**
* Convert ASCII flag
*
* Whether to convert high-ASCII and MS Word
* characters to HTML entities.
*
* @var bool
*/
public $convert_ascii = TRUE;
/**
* Response
*
* @var string
*/
public $response = '';
/**
* Error messages list
*
* @var string[]
*/
public $error_msg = array();
// --------------------------------------------------------------------
/**
* Constructor
*
* @access public
* @return void
*/
public function __construct()
{
log_message('debug', "Trackback Class Initialized");
log_message('info', 'Trackback Class Initialized');
}
// --------------------------------------------------------------------
@@ -50,11 +111,10 @@ class CI_Trackback {
/**
* Send Trackback
*
* @access public
* @param array
* @return bool
*/
function send($tb_data)
public function send($tb_data)
{
if ( ! is_array($tb_data))
{
@@ -73,38 +133,32 @@ class CI_Trackback {
switch ($item)
{
case 'ping_url' : $$item = $this->extract_urls($tb_data[$item]);
case 'ping_url':
$$item = $this->extract_urls($tb_data[$item]);
break;
case 'excerpt' : $$item = $this->limit_characters($this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
case 'excerpt':
$$item = $this->limit_characters($this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
break;
case 'url' : $$item = str_replace('&#45;', '-', $this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
case 'url':
$$item = str_replace('&#45;', '-', $this->convert_xml(strip_tags(stripslashes($tb_data[$item]))));
break;
default : $$item = $this->convert_xml(strip_tags(stripslashes($tb_data[$item])));
default:
$$item = $this->convert_xml(strip_tags(stripslashes($tb_data[$item])));
break;
}
// Convert High ASCII Characters
if ($this->convert_ascii == TRUE)
if ($this->convert_ascii === TRUE && in_array($item, array('excerpt', 'title', 'blog_name'), TRUE))
{
if ($item == 'excerpt')
{
$$item = $this->convert_ascii($$item);
}
elseif ($item == 'title')
{
$$item = $this->convert_ascii($$item);
}
elseif ($item == 'blog_name')
{
$$item = $this->convert_ascii($$item);
}
$$item = $this->convert_ascii($$item);
}
}
// Build the Trackback data string
$charset = ( ! isset($tb_data['charset'])) ? $this->charset : $tb_data['charset'];
$charset = isset($tb_data['charset']) ? $tb_data['charset'] : $this->charset;
$data = "url=".rawurlencode($url)."&title=".rawurlencode($title)."&blog_name=".rawurlencode($blog_name)."&excerpt=".rawurlencode($excerpt)."&charset=".rawurlencode($charset);
$data = 'url='.rawurlencode($url).'&title='.rawurlencode($title).'&blog_name='.rawurlencode($blog_name)
.'&excerpt='.rawurlencode($excerpt).'&charset='.rawurlencode($charset);
// Send Trackback(s)
$return = TRUE;
@@ -112,7 +166,7 @@ class CI_Trackback {
{
foreach ($ping_url as $url)
{
if ($this->process($url, $data) == FALSE)
if ($this->process($url, $data) === FALSE)
{
$return = FALSE;
}
@@ -132,29 +186,35 @@ class CI_Trackback {
* If the data is valid it is set to the $this->data array
* so that it can be inserted into a database.
*
* @access public
* @return bool
*/
function receive()
public function receive()
{
foreach (array('url', 'title', 'blog_name', 'excerpt') as $val)
{
if ( ! isset($_POST[$val]) OR $_POST[$val] == '')
if (empty($_POST[$val]))
{
$this->set_error('The following required POST variable is missing: '.$val);
return FALSE;
}
$this->data['charset'] = ( ! isset($_POST['charset'])) ? 'auto' : strtoupper(trim($_POST['charset']));
$this->data['charset'] = isset($_POST['charset']) ? strtoupper(trim($_POST['charset'])) : 'auto';
if ($val != 'url' && function_exists('mb_convert_encoding'))
if ($val !== 'url' && MB_ENABLED === TRUE)
{
$_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']);
if (MB_ENABLED === TRUE)
{
$_POST[$val] = mb_convert_encoding($_POST[$val], $this->charset, $this->data['charset']);
}
elseif (ICONV_ENABLED === TRUE)
{
$_POST[$val] = @iconv($this->data['charset'], $this->charset.'//IGNORE', $_POST[$val]);
}
}
$_POST[$val] = ($val != 'url') ? $this->convert_xml(strip_tags($_POST[$val])) : strip_tags($_POST[$val]);
$_POST[$val] = ($val !== 'url') ? $this->convert_xml(strip_tags($_POST[$val])) : strip_tags($_POST[$val]);
if ($val == 'excerpt')
if ($val === 'excerpt')
{
$_POST['excerpt'] = $this->limit_characters($_POST['excerpt']);
}
@@ -170,18 +230,16 @@ class CI_Trackback {
/**
* Send Trackback Error Message
*
* Allows custom errors to be set. By default it
* Allows custom errors to be set. By default it
* sends the "incomplete information" error, as that's
* the most common one.
*
* @access public
* @param string
* @return void
*/
function send_error($message = 'Incomplete Information')
public function send_error($message = 'Incomplete Information')
{
echo "<?xml version=\"1.0\" encoding=\"utf-8\"?".">\n<response>\n<error>1</error>\n<message>".$message."</message>\n</response>";
exit;
exit('<?xml version="1.0" encoding="utf-8"?'.">\n<response>\n<error>1</error>\n<message>".$message."</message>\n</response>");
}
// --------------------------------------------------------------------
@@ -192,13 +250,11 @@ class CI_Trackback {
* This should be called when a trackback has been
* successfully received and inserted.
*
* @access public
* @return void
*/
function send_success()
public function send_success()
{
echo "<?xml version=\"1.0\" encoding=\"utf-8\"?".">\n<response>\n<error>0</error>\n</response>";
exit;
exit('<?xml version="1.0" encoding="utf-8"?'.">\n<response>\n<error>0</error>\n</response>");
}
// --------------------------------------------------------------------
@@ -206,13 +262,12 @@ class CI_Trackback {
/**
* Fetch a particular item
*
* @access public
* @param string
* @return string
*/
function data($item)
public function data($item)
{
return ( ! isset($this->data[$item])) ? '' : $this->data[$item];
return isset($this->data[$item]) ? $this->data[$item] : '';
}
// --------------------------------------------------------------------
@@ -221,14 +276,13 @@ class CI_Trackback {
* Process Trackback
*
* Opens a socket connection and passes the data to
* the server. Returns TRUE on success, FALSE on failure
* the server. Returns TRUE on success, FALSE on failure
*
* @access public
* @param string
* @param string
* @return bool
*/
function process($url, $data)
public function process($url, $data)
{
$target = parse_url($url);
@@ -240,43 +294,37 @@ class CI_Trackback {
}
// Build the path
$ppath = ( ! isset($target['path'])) ? $url : $target['path'];
$path = (isset($target['query']) && $target['query'] != "") ? $ppath.'?'.$target['query'] : $ppath;
$path = isset($target['path']) ? $target['path'] : $url;
empty($target['query']) OR $path .= '?'.$target['query'];
// Add the Trackback ID to the data string
if ($id = $this->get_id($url))
{
$data = "tb_id=".$id."&".$data;
$data = 'tb_id='.$id.'&'.$data;
}
// Transfer the data
fputs ($fp, "POST " . $path . " HTTP/1.0\r\n" );
fputs ($fp, "Host: " . $target['host'] . "\r\n" );
fputs ($fp, "Content-type: application/x-www-form-urlencoded\r\n" );
fputs ($fp, "Content-length: " . strlen($data) . "\r\n" );
fputs ($fp, "Connection: close\r\n\r\n" );
fputs ($fp, $data);
fputs($fp, 'POST '.$path." HTTP/1.0\r\n");
fputs($fp, 'Host: '.$target['host']."\r\n");
fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n");
fputs($fp, 'Content-length: '.strlen($data)."\r\n");
fputs($fp, "Connection: close\r\n\r\n");
fputs($fp, $data);
// Was it successful?
$this->response = "";
$this->response = '';
while ( ! feof($fp))
{
$this->response .= fgets($fp, 128);
}
@fclose($fp);
if (stristr($this->response, '<error>0</error>') === FALSE)
if (stripos($this->response, '<error>0</error>') === FALSE)
{
$message = 'An unknown error was encountered';
if (preg_match("/<message>(.*?)<\/message>/is", $this->response, $match))
{
$message = trim($match['1']);
}
$message = preg_match('/<message>(.*?)<\/message>/is', $this->response, $match)
? trim($match[1])
: 'An unknown error was encountered';
$this->set_error($message);
return FALSE;
}
@@ -293,32 +341,18 @@ class CI_Trackback {
* It takes a string of URLs (separated by comma or
* space) and puts each URL into an array
*
* @access public
* @param string
* @return string
*/
function extract_urls($urls)
public function extract_urls($urls)
{
// Remove the pesky white space and replace with a comma.
$urls = preg_replace("/\s*(\S+)\s*/", "\\1,", $urls);
// Remove the pesky white space and replace with a comma, then replace doubles.
$urls = str_replace(',,', ',', preg_replace('/\s*(\S+)\s*/', '\\1,', $urls));
// If they use commas get rid of the doubles.
$urls = str_replace(",,", ",", $urls);
// Remove any comma that might be at the end
if (substr($urls, -1) == ",")
{
$urls = substr($urls, 0, -1);
}
// Break into an array via commas
$urls = preg_split('/[,]/', $urls);
// Removes duplicates
$urls = array_unique($urls);
// Break into an array via commas and remove duplicates
$urls = array_unique(preg_split('/[,]/', rtrim($urls, ',')));
array_walk($urls, array($this, 'validate_url'));
return $urls;
}
@@ -329,17 +363,16 @@ class CI_Trackback {
*
* Simply adds "http://" if missing
*
* @access public
* @param string
* @return string
* @return void
*/
function validate_url($url)
public function validate_url(&$url)
{
$url = trim($url);
if (substr($url, 0, 4) != "http")
if (stripos($url, 'http') !== 0)
{
$url = "http://".$url;
$url = 'http://'.$url;
}
}
@@ -348,13 +381,12 @@ class CI_Trackback {
/**
* Find the Trackback URL's ID
*
* @access public
* @param string
* @return string
*/
function get_id($url)
public function get_id($url)
{
$tb_id = "";
$tb_id = '';
if (strpos($url, '?') !== FALSE)
{
@@ -378,18 +410,11 @@ class CI_Trackback {
if ( ! is_numeric($tb_id))
{
$tb_id = $tb_array[count($tb_array)-2];
$tb_id = $tb_array[count($tb_array)-2];
}
}
if ( ! preg_match ("/^([0-9]+)$/", $tb_id))
{
return FALSE;
}
else
{
return $tb_id;
}
return ctype_digit((string) $tb_id) ? $tb_id : FALSE;
}
// --------------------------------------------------------------------
@@ -397,25 +422,20 @@ class CI_Trackback {
/**
* Convert Reserved XML characters to Entities
*
* @access public
* @param string
* @return string
*/
function convert_xml($str)
public function convert_xml($str)
{
$temp = '__TEMP_AMPERSANDS__';
$str = preg_replace("/&#(\d+);/", "$temp\\1;", $str);
$str = preg_replace("/&(\w+);/", "$temp\\1;", $str);
$str = preg_replace(array('/&#(\d+);/', '/&(\w+);/'), $temp.'\\1;', $str);
$str = str_replace(array("&","<",">","\"", "'", "-"),
array("&amp;", "&lt;", "&gt;", "&quot;", "&#39;", "&#45;"),
$str);
$str = str_replace(array('&', '<', '>', '"', "'", '-'),
array('&amp;', '&lt;', '&gt;', '&quot;', '&#39;', '&#45;'),
$str);
$str = preg_replace("/$temp(\d+);/","&#\\1;",$str);
$str = preg_replace("/$temp(\w+);/","&\\1;", $str);
return $str;
return preg_replace(array('/'.$temp.'(\d+);/', '/'.$temp.'(\w+);/'), array('&#\\1;', '&\\1;'), $str);
}
// --------------------------------------------------------------------
@@ -425,33 +445,32 @@ class CI_Trackback {
*
* Limits the string based on the character count. Will preserve complete words.
*
* @access public
* @param string
* @param integer
* @param int
* @param string
* @return string
*/
function limit_characters($str, $n = 500, $end_char = '&#8230;')
public function limit_characters($str, $n = 500, $end_char = '&#8230;')
{
if (strlen($str) < $n)
{
return $str;
}
$str = preg_replace("/\s+/", ' ', str_replace(array("\r\n", "\r", "\n"), ' ', $str));
$str = preg_replace('/\s+/', ' ', str_replace(array("\r\n", "\r", "\n"), ' ', $str));
if (strlen($str) <= $n)
{
return $str;
}
$out = "";
$out = '';
foreach (explode(' ', trim($str)) as $val)
{
$out .= $val.' ';
if (strlen($out) >= $n)
{
return trim($out).$end_char;
return rtrim($out).$end_char;
}
}
}
@@ -464,11 +483,10 @@ class CI_Trackback {
* Converts Hight ascii text and MS Word special chars
* to character entities
*
* @access public
* @param string
* @return string
*/
function convert_ascii($str)
public function convert_ascii($str)
{
$count = 1;
$out = '';
@@ -484,16 +502,18 @@ class CI_Trackback {
}
else
{
if (count($temp) == 0)
if (count($temp) === 0)
{
$count = ($ordinal < 224) ? 2 : 3;
}
$temp[] = $ordinal;
if (count($temp) == $count)
if (count($temp) === $count)
{
$number = ($count == 3) ? (($temp['0'] % 16) * 4096) + (($temp['1'] % 64) * 64) + ($temp['2'] % 64) : (($temp['0'] % 32) * 64) + ($temp['1'] % 64);
$number = ($count === 3)
? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64)
: (($temp[0] % 32) * 64) + ($temp[1] % 64);
$out .= '&#'.$number.';';
$count = 1;
@@ -510,11 +530,10 @@ class CI_Trackback {
/**
* Set error message
*
* @access public
* @param string
* @return void
*/
function set_error($msg)
public function set_error($msg)
{
log_message('error', $msg);
$this->error_msg[] = $msg;
@@ -525,24 +544,13 @@ class CI_Trackback {
/**
* Show error messages
*
* @access public
* @param string
* @param string
* @return string
*/
function display_errors($open = '<p>', $close = '</p>')
public function display_errors($open = '<p>', $close = '</p>')
{
$str = '';
foreach ($this->error_msg as $val)
{
$str .= $open.$val.$close;
}
return $str;
return (count($this->error_msg) > 0) ? $open.implode($close.$open, $this->error_msg).$close : '';
}
}
// END Trackback Class
/* End of file Trackback.php */
/* Location: ./system/libraries/Trackback.php */