mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-24 03:07:13 +00:00
Codeignitor 3.1.6 and corresponding changes
- 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
@@ -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.3.0
|
||||
* @filesource
|
||||
*/
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
/**
|
||||
* SQLite Result Class
|
||||
@@ -21,20 +43,21 @@
|
||||
* This class extends the parent result class: CI_DB_result
|
||||
*
|
||||
* @category Database
|
||||
* @author ExpressionEngine Dev Team
|
||||
* @link http://codeigniter.com/user_guide/database/
|
||||
* @author EllisLab Dev Team
|
||||
* @link https://codeigniter.com/user_guide/database/
|
||||
*/
|
||||
class CI_DB_sqlite_result extends CI_DB_result {
|
||||
|
||||
/**
|
||||
* Number of rows in the result set
|
||||
*
|
||||
* @access public
|
||||
* @return integer
|
||||
* @return int
|
||||
*/
|
||||
function num_rows()
|
||||
public function num_rows()
|
||||
{
|
||||
return @sqlite_num_rows($this->result_id);
|
||||
return is_int($this->num_rows)
|
||||
? $this->num_rows
|
||||
: $this->num_rows = @sqlite_num_rows($this->result_id);
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
@@ -42,10 +65,9 @@ class CI_DB_sqlite_result extends CI_DB_result {
|
||||
/**
|
||||
* Number of fields in the result set
|
||||
*
|
||||
* @access public
|
||||
* @return integer
|
||||
* @return int
|
||||
*/
|
||||
function num_fields()
|
||||
public function num_fields()
|
||||
{
|
||||
return @sqlite_num_fields($this->result_id);
|
||||
}
|
||||
@@ -57,15 +79,14 @@ class CI_DB_sqlite_result extends CI_DB_result {
|
||||
*
|
||||
* Generates an array of column names
|
||||
*
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
function list_fields()
|
||||
public function list_fields()
|
||||
{
|
||||
$field_names = array();
|
||||
for ($i = 0; $i < $this->num_fields(); $i++)
|
||||
for ($i = 0, $c = $this->num_fields(); $i < $c; $i++)
|
||||
{
|
||||
$field_names[] = sqlite_field_name($this->result_id, $i);
|
||||
$field_names[$i] = sqlite_field_name($this->result_id, $i);
|
||||
}
|
||||
|
||||
return $field_names;
|
||||
@@ -78,22 +99,17 @@ class CI_DB_sqlite_result extends CI_DB_result {
|
||||
*
|
||||
* Generates an array of objects containing field meta-data
|
||||
*
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
function field_data()
|
||||
public function field_data()
|
||||
{
|
||||
$retval = array();
|
||||
for ($i = 0; $i < $this->num_fields(); $i++)
|
||||
for ($i = 0, $c = $this->num_fields(); $i < $c; $i++)
|
||||
{
|
||||
$F = new stdClass();
|
||||
$F->name = sqlite_field_name($this->result_id, $i);
|
||||
$F->type = 'varchar';
|
||||
$F->max_length = 0;
|
||||
$F->primary_key = 0;
|
||||
$F->default = '';
|
||||
|
||||
$retval[] = $F;
|
||||
$retval[$i] = new stdClass();
|
||||
$retval[$i]->name = sqlite_field_name($this->result_id, $i);
|
||||
$retval[$i]->type = NULL;
|
||||
$retval[$i]->max_length = NULL;
|
||||
}
|
||||
|
||||
return $retval;
|
||||
@@ -101,29 +117,17 @@ class CI_DB_sqlite_result extends CI_DB_result {
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Free the result
|
||||
*
|
||||
* @return null
|
||||
*/
|
||||
function free_result()
|
||||
{
|
||||
// Not implemented in SQLite
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Data Seek
|
||||
*
|
||||
* Moves the internal pointer to the desired offset. We call
|
||||
* Moves the internal pointer to the desired offset. We call
|
||||
* this internally before fetching results to make sure the
|
||||
* result set starts at zero
|
||||
* result set starts at zero.
|
||||
*
|
||||
* @access private
|
||||
* @return array
|
||||
* @param int $n
|
||||
* @return bool
|
||||
*/
|
||||
function _data_seek($n = 0)
|
||||
public function data_seek($n = 0)
|
||||
{
|
||||
return sqlite_seek($this->result_id, $n);
|
||||
}
|
||||
@@ -135,10 +139,9 @@ class CI_DB_sqlite_result extends CI_DB_result {
|
||||
*
|
||||
* Returns the result set as an array
|
||||
*
|
||||
* @access private
|
||||
* @return array
|
||||
*/
|
||||
function _fetch_assoc()
|
||||
protected function _fetch_assoc()
|
||||
{
|
||||
return sqlite_fetch_array($this->result_id);
|
||||
}
|
||||
@@ -150,30 +153,12 @@ class CI_DB_sqlite_result extends CI_DB_result {
|
||||
*
|
||||
* Returns the result set as an object
|
||||
*
|
||||
* @access private
|
||||
* @param string $class_name
|
||||
* @return object
|
||||
*/
|
||||
function _fetch_object()
|
||||
protected function _fetch_object($class_name = 'stdClass')
|
||||
{
|
||||
if (function_exists('sqlite_fetch_object'))
|
||||
{
|
||||
return sqlite_fetch_object($this->result_id);
|
||||
}
|
||||
else
|
||||
{
|
||||
$arr = sqlite_fetch_array($this->result_id, SQLITE_ASSOC);
|
||||
if (is_array($arr))
|
||||
{
|
||||
$obj = (object) $arr;
|
||||
return $obj;
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return sqlite_fetch_object($this->result_id, $class_name);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* End of file sqlite_result.php */
|
||||
/* Location: ./system/database/drivers/sqlite/sqlite_result.php */
|
||||
Reference in New Issue
Block a user