diff --git a/composer.lock b/composer.lock
index 2c31f1c5a..1f84c9887 100644
--- a/composer.lock
+++ b/composer.lock
@@ -9,20 +9,20 @@
"packages": [
{
"name": "codeigniter/framework",
- "version": "3.1.4",
+ "version": "3.1.5",
"source": {
"type": "git",
"url": "https://github.com/bcit-ci/CodeIgniter.git",
- "reference": "873608df8be83420474e3cf9fc749a8ed12a6c09"
+ "reference": "6c7a4266410070d30f8f6bcdf9c9e67f3d6478e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/873608df8be83420474e3cf9fc749a8ed12a6c09",
- "reference": "873608df8be83420474e3cf9fc749a8ed12a6c09",
+ "url": "https://api.github.com/repos/bcit-ci/CodeIgniter/zipball/6c7a4266410070d30f8f6bcdf9c9e67f3d6478e3",
+ "reference": "6c7a4266410070d30f8f6bcdf9c9e67f3d6478e3",
"shasum": ""
},
"require": {
- "php": ">=5.2.4"
+ "php": ">=5.3.7"
},
"require-dev": {
"mikey179/vfsstream": "1.1.*",
@@ -38,7 +38,7 @@
],
"description": "The CodeIgniter framework",
"homepage": "https://codeigniter.com",
- "time": "2017-03-20 15:51:08"
+ "time": "2017-06-19 08:33:58"
},
{
"name": "dompdf/dompdf",
diff --git a/vendor/codeigniter/framework/application/config/database.php b/vendor/codeigniter/framework/application/config/database.php
new file mode 100644
index 000000000..bf9857fff
--- /dev/null
+++ b/vendor/codeigniter/framework/application/config/database.php
@@ -0,0 +1,96 @@
+db->last_query() and profiling of DB queries.
+| When you run a query, with this setting set to TRUE (default),
+| CodeIgniter will store the SQL statement for debugging purposes.
+| However, this may cause high memory usage, especially if you run
+| a lot of SQL queries ... disable this to avoid that problem.
+|
+| The $active_group variable lets you choose which connection group to
+| make active. By default there is only one group (the 'default' group).
+|
+| The $query_builder variables lets you determine whether or not to load
+| the query builder class.
+*/
+$active_group = 'default';
+$query_builder = TRUE;
+
+$db['default'] = array(
+ 'dsn' => '',
+ 'hostname' => 'localhost',
+ 'username' => '',
+ 'password' => '',
+ 'database' => '',
+ 'dbdriver' => 'mysqli',
+ 'dbprefix' => '',
+ 'pconnect' => FALSE,
+ 'db_debug' => (ENVIRONMENT !== 'production'),
+ 'cache_on' => FALSE,
+ 'cachedir' => '',
+ 'char_set' => 'utf8',
+ 'dbcollat' => 'utf8_general_ci',
+ 'swap_pre' => '',
+ 'encrypt' => FALSE,
+ 'compress' => FALSE,
+ 'stricton' => FALSE,
+ 'failover' => array(),
+ 'save_queries' => TRUE
+);
diff --git a/vendor/codeigniter/framework/composer.json b/vendor/codeigniter/framework/composer.json
index 0a898d2c1..c40d549c9 100644
--- a/vendor/codeigniter/framework/composer.json
+++ b/vendor/codeigniter/framework/composer.json
@@ -11,7 +11,7 @@
"source": "https://github.com/bcit-ci/CodeIgniter"
},
"require": {
- "php": ">=5.2.4"
+ "php": ">=5.3.7"
},
"suggest": {
"paragonie/random_compat": "Provides better randomness in PHP 5.x"
diff --git a/vendor/codeigniter/framework/system/core/CodeIgniter.php b/vendor/codeigniter/framework/system/core/CodeIgniter.php
index 880abab57..823e034d7 100644
--- a/vendor/codeigniter/framework/system/core/CodeIgniter.php
+++ b/vendor/codeigniter/framework/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
* @var string
*
*/
- const CI_VERSION = '3.1.4';
+ const CI_VERSION = '3.1.5';
/*
* ------------------------------------------------------
@@ -434,7 +434,7 @@ if ( ! is_php('5.4'))
* ReflectionMethod::isConstructor() is the ONLY reliable check,
* knowing which method will be executed as a constructor.
*/
- elseif ( ! is_callable(array($class, $method)) && strcasecmp($class, $method) === 0)
+ elseif ( ! is_callable(array($class, $method)))
{
$reflection = new ReflectionMethod($class, $method);
if ( ! $reflection->isPublic() OR $reflection->isConstructor())
diff --git a/vendor/codeigniter/framework/system/core/Common.php b/vendor/codeigniter/framework/system/core/Common.php
index 2fd5c5809..d6a1fdb4e 100644
--- a/vendor/codeigniter/framework/system/core/Common.php
+++ b/vendor/codeigniter/framework/system/core/Common.php
@@ -135,7 +135,7 @@ if ( ! function_exists('load_class'))
*
* @param string the class name being requested
* @param string the directory where the class should be found
- * @param string an optional argument to pass to the class constructor
+ * @param mixed an optional argument to pass to the class constructor
* @return object
*/
function &load_class($class, $directory = 'libraries', $param = NULL)
diff --git a/vendor/codeigniter/framework/system/core/Exceptions.php b/vendor/codeigniter/framework/system/core/Exceptions.php
index 47d153f49..526909602 100644
--- a/vendor/codeigniter/framework/system/core/Exceptions.php
+++ b/vendor/codeigniter/framework/system/core/Exceptions.php
@@ -231,7 +231,7 @@ class CI_Exceptions {
* @param string $message Error message
* @param string $filepath File path
* @param int $line Line number
- * @return string Error page output
+ * @return void
*/
public function show_php_error($severity, $message, $filepath, $line)
{
diff --git a/vendor/codeigniter/framework/system/core/Output.php b/vendor/codeigniter/framework/system/core/Output.php
index 6ddded22a..a3155fece 100644
--- a/vendor/codeigniter/framework/system/core/Output.php
+++ b/vendor/codeigniter/framework/system/core/Output.php
@@ -586,62 +586,59 @@ class CI_Output {
return;
}
- if (flock($fp, LOCK_EX))
- {
- // If output compression is enabled, compress the cache
- // itself, so that we don't have to do that each time
- // we're serving it
- if ($this->_compress_output === TRUE)
- {
- $output = gzencode($output);
-
- if ($this->get_header('content-type') === NULL)
- {
- $this->set_content_type($this->mime_type);
- }
- }
-
- $expire = time() + ($this->cache_expiration * 60);
-
- // Put together our serialized info.
- $cache_info = serialize(array(
- 'expire' => $expire,
- 'headers' => $this->headers
- ));
-
- $output = $cache_info.'ENDCI--->'.$output;
-
- for ($written = 0, $length = self::strlen($output); $written < $length; $written += $result)
- {
- if (($result = fwrite($fp, self::substr($output, $written))) === FALSE)
- {
- break;
- }
- }
-
- flock($fp, LOCK_UN);
- }
- else
+ if ( ! flock($fp, LOCK_EX))
{
log_message('error', 'Unable to secure a file lock for file at: '.$cache_path);
+ fclose($fp);
return;
}
+ // If output compression is enabled, compress the cache
+ // itself, so that we don't have to do that each time
+ // we're serving it
+ if ($this->_compress_output === TRUE)
+ {
+ $output = gzencode($output);
+
+ if ($this->get_header('content-type') === NULL)
+ {
+ $this->set_content_type($this->mime_type);
+ }
+ }
+
+ $expire = time() + ($this->cache_expiration * 60);
+
+ // Put together our serialized info.
+ $cache_info = serialize(array(
+ 'expire' => $expire,
+ 'headers' => $this->headers
+ ));
+
+ $output = $cache_info.'ENDCI--->'.$output;
+
+ for ($written = 0, $length = self::strlen($output); $written < $length; $written += $result)
+ {
+ if (($result = fwrite($fp, self::substr($output, $written))) === FALSE)
+ {
+ break;
+ }
+ }
+
+ flock($fp, LOCK_UN);
fclose($fp);
- if (is_int($result))
- {
- chmod($cache_path, 0640);
- log_message('debug', 'Cache file written: '.$cache_path);
-
- // Send HTTP cache-control headers to browser to match file cache settings.
- $this->set_cache_header($_SERVER['REQUEST_TIME'], $expire);
- }
- else
+ if ( ! is_int($result))
{
@unlink($cache_path);
log_message('error', 'Unable to write the complete cache content at: '.$cache_path);
+ return;
}
+
+ chmod($cache_path, 0640);
+ log_message('debug', 'Cache file written: '.$cache_path);
+
+ // Send HTTP cache-control headers to browser to match file cache settings.
+ $this->set_cache_header($_SERVER['REQUEST_TIME'], $expire);
}
// --------------------------------------------------------------------
@@ -708,11 +705,9 @@ class CI_Output {
log_message('debug', 'Cache file has expired. File deleted.');
return FALSE;
}
- else
- {
- // Or else send the HTTP cache control headers.
- $this->set_cache_header($last_modified, $expire);
- }
+
+ // Send the HTTP cache control headers
+ $this->set_cache_header($last_modified, $expire);
// Add headers from cache file.
foreach ($cache_info['headers'] as $header)
@@ -798,13 +793,11 @@ class CI_Output {
$this->set_status_header(304);
exit;
}
- else
- {
- header('Pragma: public');
- header('Cache-Control: max-age='.$max_age.', public');
- header('Expires: '.gmdate('D, d M Y H:i:s', $expiration).' GMT');
- header('Last-modified: '.gmdate('D, d M Y H:i:s', $last_modified).' GMT');
- }
+
+ header('Pragma: public');
+ header('Cache-Control: max-age='.$max_age.', public');
+ header('Expires: '.gmdate('D, d M Y H:i:s', $expiration).' GMT');
+ header('Last-modified: '.gmdate('D, d M Y H:i:s', $last_modified).' GMT');
}
// --------------------------------------------------------------------
diff --git a/vendor/codeigniter/framework/system/core/compat/mbstring.php b/vendor/codeigniter/framework/system/core/compat/mbstring.php
index f466e1c34..1b2f2c63b 100644
--- a/vendor/codeigniter/framework/system/core/compat/mbstring.php
+++ b/vendor/codeigniter/framework/system/core/compat/mbstring.php
@@ -68,7 +68,7 @@ if ( ! function_exists('mb_strlen'))
* @link http://php.net/mb_strlen
* @param string $str
* @param string $encoding
- * @return string
+ * @return int
*/
function mb_strlen($str, $encoding = NULL)
{
diff --git a/vendor/codeigniter/framework/system/database/DB_cache.php b/vendor/codeigniter/framework/system/database/DB_cache.php
index b74c31924..7c8ee5fc9 100644
--- a/vendor/codeigniter/framework/system/database/DB_cache.php
+++ b/vendor/codeigniter/framework/system/database/DB_cache.php
@@ -143,7 +143,7 @@ class CI_DB_Cache {
$segment_two = ($this->CI->uri->segment(2) == FALSE) ? 'index' : $this->CI->uri->segment(2);
$filepath = $this->db->cachedir.$segment_one.'+'.$segment_two.'/'.md5($sql);
- if (FALSE === ($cachedata = @file_get_contents($filepath)))
+ if ( ! is_file($filepath) OR FALSE === ($cachedata = file_get_contents($filepath)))
{
return FALSE;
}
diff --git a/vendor/codeigniter/framework/system/database/DB_forge.php b/vendor/codeigniter/framework/system/database/DB_forge.php
index 7289235c8..3cb02ca4e 100644
--- a/vendor/codeigniter/framework/system/database/DB_forge.php
+++ b/vendor/codeigniter/framework/system/database/DB_forge.php
@@ -488,7 +488,7 @@ abstract class CI_DB_forge {
*
* @param string $table Table name
* @param bool $if_exists Whether to add an IF EXISTS condition
- * @return string
+ * @return mixed (Returns a platform-specific DROP table string, or TRUE to indicate there's nothing to do)
*/
protected function _drop_table($table, $if_exists)
{
@@ -979,8 +979,8 @@ abstract class CI_DB_forge {
/**
* Process indexes
*
- * @param string $table
- * @return string
+ * @param string $table Table name
+ * @return string[] list of SQL statements
*/
protected function _process_indexes($table)
{
diff --git a/vendor/codeigniter/framework/system/database/DB_query_builder.php b/vendor/codeigniter/framework/system/database/DB_query_builder.php
index 0abf2a260..9216651aa 100644
--- a/vendor/codeigniter/framework/system/database/DB_query_builder.php
+++ b/vendor/codeigniter/framework/system/database/DB_query_builder.php
@@ -1409,7 +1409,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
$this->qb_orderby = NULL;
}
- $result = ($this->qb_distinct === TRUE OR ! empty($this->qb_groupby) OR ! empty($this->qb_cache_groupby))
+ $result = ($this->qb_distinct === TRUE OR ! empty($this->qb_groupby) OR ! empty($this->qb_cache_groupby) OR $this->qb_limit OR $this->qb_offset)
? $this->query($this->_count_string.$this->protect_identifiers('numrows')."\nFROM (\n".$this->_compile_select()."\n) CI_count_all_results")
: $this->query($this->_compile_select($this->_count_string.$this->protect_identifiers('numrows')));
diff --git a/vendor/codeigniter/framework/system/database/drivers/ibase/ibase_forge.php b/vendor/codeigniter/framework/system/database/drivers/ibase/ibase_forge.php
index 44bb24e68..31352f128 100644
--- a/vendor/codeigniter/framework/system/database/drivers/ibase/ibase_forge.php
+++ b/vendor/codeigniter/framework/system/database/drivers/ibase/ibase_forge.php
@@ -91,7 +91,7 @@ class CI_DB_ibase_forge extends CI_DB_forge {
* Create database
*
* @param string $db_name
- * @return string
+ * @return bool
*/
public function create_database($db_name)
{
diff --git a/vendor/codeigniter/framework/system/database/drivers/oci8/oci8_forge.php b/vendor/codeigniter/framework/system/database/drivers/oci8/oci8_forge.php
index 867a94341..724a76df4 100644
--- a/vendor/codeigniter/framework/system/database/drivers/oci8/oci8_forge.php
+++ b/vendor/codeigniter/framework/system/database/drivers/oci8/oci8_forge.php
@@ -124,7 +124,7 @@ class CI_DB_oci8_forge extends CI_DB_forge {
if ($alter_type === 'MODIFY' && ! empty($field[$i]['new_name']))
{
$sqls[] = $sql.' RENAME COLUMN '.$this->db->escape_identifiers($field[$i]['name'])
- .' '.$this->db->escape_identifiers($field[$i]['new_name']);
+ .' TO '.$this->db->escape_identifiers($field[$i]['new_name']);
}
$field[$i] = "\n\t".$field[$i]['_literal'];
diff --git a/vendor/codeigniter/framework/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/vendor/codeigniter/framework/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
index c8983ee56..813207b8e 100644
--- a/vendor/codeigniter/framework/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
+++ b/vendor/codeigniter/framework/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
@@ -117,7 +117,7 @@ class CI_DB_pdo_oci_forge extends CI_DB_pdo_forge {
if ($alter_type === 'MODIFY' && ! empty($field[$i]['new_name']))
{
$sqls[] = $sql.' RENAME COLUMN '.$this->db->escape_identifiers($field[$i]['name'])
- .' '.$this->db->escape_identifiers($field[$i]['new_name']);
+ .' TO '.$this->db->escape_identifiers($field[$i]['new_name']);
}
}
}
diff --git a/vendor/codeigniter/framework/system/helpers/form_helper.php b/vendor/codeigniter/framework/system/helpers/form_helper.php
index a49eea803..13f196318 100644
--- a/vendor/codeigniter/framework/system/helpers/form_helper.php
+++ b/vendor/codeigniter/framework/system/helpers/form_helper.php
@@ -597,7 +597,7 @@ if ( ! function_exists('form_label'))
*
* @param string The text to appear onscreen
* @param string The id the label applies to
- * @param array Additional attributes
+ * @param mixed Additional attributes
* @return string
*/
function form_label($label_text = '', $id = '', $attributes = array())
@@ -610,13 +610,7 @@ if ( ! function_exists('form_label'))
$label .= ' for="'.$id.'"';
}
- if (is_array($attributes) && count($attributes) > 0)
- {
- foreach ($attributes as $key => $val)
- {
- $label .= ' '.$key.'="'.$val.'"';
- }
- }
+ $label .= _attributes_to_string($attributes);
return $label.'>'.$label_text.'';
}
diff --git a/vendor/codeigniter/framework/system/helpers/inflector_helper.php b/vendor/codeigniter/framework/system/helpers/inflector_helper.php
index 26a5a5ca9..4a6805fbb 100644
--- a/vendor/codeigniter/framework/system/helpers/inflector_helper.php
+++ b/vendor/codeigniter/framework/system/helpers/inflector_helper.php
@@ -95,6 +95,7 @@ if ( ! function_exists('singular'))
'/(s)tatuses$/' => '\1\2tatus',
'/(c)hildren$/' => '\1\2hild',
'/(n)ews$/' => '\1\2ews',
+ '/(quiz)zes$/' => '\1',
'/([^us])s$/' => '\1'
);
diff --git a/vendor/codeigniter/framework/system/language/arabic/calendar_lang.php b/vendor/codeigniter/framework/system/language/arabic/calendar_lang.php
index 2fc7580ff..f238afdbf 100644
--- a/vendor/codeigniter/framework/system/language/arabic/calendar_lang.php
+++ b/vendor/codeigniter/framework/system/language/arabic/calendar_lang.php
@@ -10,21 +10,21 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['cal_su'] = 'أح';
-$lang['cal_mo'] = 'إث';
+$lang['cal_mo'] = 'ٱث';
$lang['cal_tu'] = 'ثل';
$lang['cal_we'] = 'أر';
$lang['cal_th'] = 'خم';
$lang['cal_fr'] = 'جم';
$lang['cal_sa'] = 'سب';
$lang['cal_sun'] = 'أح';
-$lang['cal_mon'] = 'إث';
+$lang['cal_mon'] = 'ٱث';
$lang['cal_tue'] = 'ثل';
$lang['cal_wed'] = 'أر';
$lang['cal_thu'] = 'خم';
$lang['cal_fri'] = 'جم';
$lang['cal_sat'] = 'سب';
$lang['cal_sunday'] = 'الأحد';
-$lang['cal_monday'] = 'الإثنين';
+$lang['cal_monday'] = 'الاثنين';
$lang['cal_tuesday'] = 'الثلاثاء';
$lang['cal_wednesday'] = 'الأربعاء';
$lang['cal_thursday'] = 'الخميس';
diff --git a/vendor/codeigniter/framework/system/language/arabic/db_lang.php b/vendor/codeigniter/framework/system/language/arabic/db_lang.php
index 7d09ec983..81906514e 100644
--- a/vendor/codeigniter/framework/system/language/arabic/db_lang.php
+++ b/vendor/codeigniter/framework/system/language/arabic/db_lang.php
@@ -14,22 +14,22 @@ $lang['db_unable_to_connect'] = 'غير قادر على الإتصال بقوا
$lang['db_unable_to_select'] = 'غير قادر على تحديد قاعدة البيانات التالية: %s';
$lang['db_unable_to_create'] = 'غير قادر على إنشاء قاعدة البيانات التالية: %s';
$lang['db_invalid_query'] = 'الإستعلام المرسل غير صحيح.';
-$lang['db_must_set_table'] = 'يجب وضع جدول قاعدة بيانات للإستخدامة مع الإستعلام.';
+$lang['db_must_set_table'] = 'يجب وضع جدول قاعدة بيانات للإستخدام مع الإستعلام.';
$lang['db_must_use_set'] = 'يجب إستخدام خاصية "set" لتحديث السجيل.';
$lang['db_must_use_index'] = 'يجب تحديد رقم للتحديثات.';
-$lang['db_batch_missing_index'] = 'سجل أو أكثر لا يحتوى على رقم التحديث.';
-$lang['db_must_use_where'] = 'التحديث غير مسموح به مالم يحتوى على جملة "where" أو "like".';
-$lang['db_del_must_use_where'] = 'الحذف غير مسموح به مالم يحتوى على جملة "where" أو "like".';
-$lang['db_field_param_missing'] = 'لجلب أسماء الحقول يجب إرسال إسم الجدول كمتغير.';
-$lang['db_unsupported_function'] = 'هذه الميزة غير متوفرة في قاعدة البيانات التى تستخدمها.';
+$lang['db_batch_missing_index'] = 'سجل أو أكثر لا يحتوي على رقم التحديث.';
+$lang['db_must_use_where'] = 'التحديث غير مسموح به ما لم يحتوي على جملة "where" أو "like".';
+$lang['db_del_must_use_where'] = 'الحذف غير مسموح به ما لم يحتوي على جملة "where" أو "like".';
+$lang['db_field_param_missing'] = 'لجلب أسماء الحقول يجب إرسال اسم الجدول بصفته متغيرا.';
+$lang['db_unsupported_function'] = 'هذه الميزة غير متوفرة في قاعدة البيانات التي تستخدمها.';
$lang['db_transaction_failure'] = 'فشل في الإجراء: تم التراجع عن الإجراء.';
$lang['db_unable_to_drop'] = 'غير قادر على إزالة قاعدة البيانات المحددة.';
-$lang['db_unsupported_feature'] = 'ميزة غير متوفرة في قاعدة البيانات التى تستخدمها.';
+$lang['db_unsupported_feature'] = 'ميزة غير متوفرة في قاعدة البيانات التي تستخدمها.';
$lang['db_unsupported_compression'] = 'نوع ضغط الملف المحدد غير مدعوم على الخادم.';
$lang['db_filepath_error'] = 'غير قادر على كتابة الملف في المسار المحدد.';
$lang['db_invalid_cache_path'] = 'مسار التخزين المؤقت غير صحيح أو غير قابل للكتابة.';
-$lang['db_table_name_required'] = 'إسم الجدول مطلوب لهذه العملية.';
-$lang['db_column_name_required'] = 'إسم العمود مطلوب لهذه العملية.';
+$lang['db_table_name_required'] = 'اسم الجدول مطلوب لهذه العملية.';
+$lang['db_column_name_required'] = 'اسم العمود مطلوب لهذه العملية.';
$lang['db_column_definition_required'] = 'تعريف العمود مطلوب لهذه العملية.';
$lang['db_unable_to_set_charset'] = 'غير قادر على تحديد نوع الترميز: %s';
$lang['db_error_heading'] = 'حصل خطأ في قاعدة البيانات';
diff --git a/vendor/codeigniter/framework/system/language/arabic/email_lang.php b/vendor/codeigniter/framework/system/language/arabic/email_lang.php
index fc6ef22ad..537519699 100644
--- a/vendor/codeigniter/framework/system/language/arabic/email_lang.php
+++ b/vendor/codeigniter/framework/system/language/arabic/email_lang.php
@@ -10,21 +10,21 @@
defined('BASEPATH') OR exit('No direct script access allowed');
$lang['email_must_be_array'] = 'يجب تمرير مصفوفة إلى دالة التحقق من البريد الإلكتروني.';
-$lang['email_invalid_address'] = 'عنوان بريد إلكتروني خاطيء: %s';
+$lang['email_invalid_address'] = 'عنوان بريد إلكتروني خاطئ: %s';
$lang['email_attachment_missing'] = 'غير قادر على إيجاد الملف المرفق: %s';
$lang['email_attachment_unreadable'] = 'غير قاد على فتح الملف المرفق: %s';
$lang['email_no_from'] = 'لا يمكن إرسال البريد الإلكتروني بدون تحديد المرسل.';
$lang['email_no_recipients'] = 'يجب إضافة مستقبلين: To, Cc, or Bcc';
-$lang['email_send_failure_phpmail'] = 'غير قادر على الإرسال بإستخدام PHP mail(). قد يكون الخادم غير معد للإرسال بإستخدام هذه الطريقة.';
-$lang['email_send_failure_sendmail'] = 'غير قادر على الإرسال بإستخدام PHP Sendmail. قد يكون الخادم غير معد للإرسال بإستخدام هذه الطريقة.';
-$lang['email_send_failure_smtp'] = 'غير قادر على الإرسال بإستخدام PHP SMTP. قد يكون الخادم غير معد للإرسال بإستخدام هذه الطريقة.';
-$lang['email_sent'] = 'تم إرسال الرسالة بنجاح بإستخدام البروتوكول التالي: %s';
+$lang['email_send_failure_phpmail'] = 'غير قادر على الإرسال باستخدام PHP mail(). قد يكون الخادم غير معد للإرسال باستخدام هذه الطريقة.';
+$lang['email_send_failure_sendmail'] = 'غير قادر على الإرسال باستخدام PHP Sendmail. قد يكون الخادم غير معد للإرسال باستخدام هذه الطريقة.';
+$lang['email_send_failure_smtp'] = 'غير قادر على الإرسال باستخدام PHP SMTP. قد يكون الخادم غير معد للإرسال باستخدام هذه الطريقة.';
+$lang['email_sent'] = 'تم إرسال الرسالة بنجاح باستخدام البروتوكول التالي: %s';
$lang['email_no_socket'] = 'غير قادر على فتح إتصال مع Sendmail. الرجاء التأكد من الإعدادات.';
$lang['email_no_hostname'] = 'لم تحدد إسم المضيف لـ SMTP.';
$lang['email_smtp_error'] = 'خطأ SMTP حدث: %s';
$lang['email_no_smtp_unpw'] = 'خطأ: يجب تحديد إسم مستخدم وكلمة مرور لـ SMTP.';
$lang['email_failed_smtp_login'] = 'فشل في إرسال أمر AUTH LOGIN command. الخطأ: %s';
-$lang['email_smtp_auth_un'] = 'فشل في التحقق من إسم المستخدم. الخطأ: %s';
+$lang['email_smtp_auth_un'] = 'فشل في التحقق من اسم المستخدم. الخطأ: %s';
$lang['email_smtp_auth_pw'] = 'فشل في التحقق من كلمة مرور. الخطأ: %s';
$lang['email_smtp_data_failure'] = 'غير قادر على إرسال البيانات: %s';
$lang['email_exit_status'] = 'رمز الخطأ: %s';
diff --git a/vendor/codeigniter/framework/system/language/armenian/imglib_lang.php b/vendor/codeigniter/framework/system/language/armenian/imglib_lang.php
index 67626c23b..baf37afa9 100644
--- a/vendor/codeigniter/framework/system/language/armenian/imglib_lang.php
+++ b/vendor/codeigniter/framework/system/language/armenian/imglib_lang.php
@@ -23,7 +23,7 @@ $lang['imglib_libpath_invalid'] = 'Ճանապարհը դեպի նկարների
$lang['imglib_image_process_failed'] = 'Նկարի հետ աշխատանքը ձախողվեց։ Խնդրում ենք ստուգել, որ ձեր սերվերը ապահովվում է նշված կանոնագիրը և ճանապարհը դեպի նկարների գրադարանը ճիշտ է։';
$lang['imglib_rotation_angle_required'] = 'Անհրաժեշտ է ներկայացնել պտույտի անկյունը նկարը պտտելու համար։';
$lang['imglib_invalid_path'] = 'Ճանապարհը դեպի նկար սխալ է։';
-$lang['imglib_invalid_image'] = 'The provided image is not valid.';
+$lang['imglib_invalid_image'] = 'Տրամադրված պատկերը չէ վավեր.';
$lang['imglib_copy_failed'] = 'Նկարը պատճենելը ավարտվեց անհաջողությամբ։';
$lang['imglib_missing_font'] = 'Չհաջողվեց գտնել տառատեսակը։';
$lang['imglib_save_failed'] = 'Պահպանել նկարը չհաջողվեց։ Խնդրում ենք համոզվել, որ նկարը և ֆայլի պանակը հասանելի են գրելու համար։';
diff --git a/vendor/codeigniter/framework/system/language/azerbaijani/imglib_lang.php b/vendor/codeigniter/framework/system/language/azerbaijani/imglib_lang.php
index b28ea486d..4bea1656d 100644
--- a/vendor/codeigniter/framework/system/language/azerbaijani/imglib_lang.php
+++ b/vendor/codeigniter/framework/system/language/azerbaijani/imglib_lang.php
@@ -23,7 +23,7 @@ $lang['imglib_libpath_invalid'] = 'Şəkil kitabxanası yolu səhvdi. L
$lang['imglib_image_process_failed'] = 'Şəkil emalı uğursuz oldu. Lütfən serverinizin seçilən protokolu dəstəklədiyini və şəkil kitabxanasının yolunu doğru olduğunu yoxlayın.';
$lang['imglib_rotation_angle_required'] = 'Şəkilin dönədrilməsi üçün döndərmə bucağı lazımdı.';
$lang['imglib_invalid_path'] = 'Şəkil yolu doğru deyil..';
-$lang['imglib_invalid_image'] = 'The provided image is not valid.';
+$lang['imglib_invalid_image'] = 'təqdim image etibarlı deyil.';
$lang['imglib_copy_failed'] = 'Şəkil kopiyalama əməliyyatı uğursuz oldu.';
$lang['imglib_missing_font'] = 'İstifadə ediləcək font tapılmadı.';
$lang['imglib_save_failed'] = 'Şəkil yadda saxlanılmadı. Şəkilin və qovluğun yazıla bilər olduğunu yoxlayın.';
diff --git a/vendor/codeigniter/framework/system/language/bengali/imglib_lang.php b/vendor/codeigniter/framework/system/language/bengali/imglib_lang.php
index d8b2116a7..c83480d5e 100644
--- a/vendor/codeigniter/framework/system/language/bengali/imglib_lang.php
+++ b/vendor/codeigniter/framework/system/language/bengali/imglib_lang.php
@@ -23,7 +23,7 @@ $lang['imglib_libpath_invalid'] = 'ছবির লাইব্রেরির
$lang['imglib_image_process_failed'] = 'ছবিকে প্রসেস করা সম্ভব হয় নি, চেক করুন আপনার সার্ভার ইমেজ লাইব্রেরী সাপোর্ট করে কিনা।';
$lang['imglib_rotation_angle_required'] = 'ছবিকে রোটেট করার জন্য, এঙ্গেল দিতে হবে।';
$lang['imglib_invalid_path'] = 'ছবির ডিরেক্টরি সঠিক নয়।';
-$lang['imglib_invalid_image'] = 'The provided image is not valid.';
+$lang['imglib_invalid_image'] = 'প্রদত্ত ইমেজ বৈধ নয়.';
$lang['imglib_copy_failed'] = 'ছবি কপি করা সম্ভব হয় নি।';
$lang['imglib_missing_font'] = 'ফন্ট পাওয়া যায় নি।';
$lang['imglib_save_failed'] = 'ছবিটিকে সংরক্ষণ করা সম্ভব হয় নি, চেক করুন ডিরেক্টরি রাইটেবল কিনা।';
diff --git a/vendor/codeigniter/framework/system/language/catalan/imglib_lang.php b/vendor/codeigniter/framework/system/language/catalan/imglib_lang.php
index 8d3695f1f..1f16e6923 100644
--- a/vendor/codeigniter/framework/system/language/catalan/imglib_lang.php
+++ b/vendor/codeigniter/framework/system/language/catalan/imglib_lang.php
@@ -24,7 +24,7 @@ $lang['imglib_libpath_invalid'] = 'La ruta a la teva llibreria de processament d
$lang['imglib_image_process_failed'] = 'Processament d\'imatge erroni. Siusplau verifica que el teu servidor disposa del protocol triat i que la ruta a la teva llibreria de processament d\'imatges és correcta.';
$lang['imglib_rotation_angle_required'] = 'Per tal de rotar la imatge és necessari indicar un angle de rotació.';
$lang['imglib_invalid_path'] = 'La ruta a la imatge no és correcta.';
-$lang['imglib_invalid_image'] = 'The provided image is not valid.';
+$lang['imglib_invalid_image'] = 'La imatge no és vàlid.';
$lang['imglib_copy_failed'] = 'La rutina de copia d\'imatge ha fallat.';
$lang['imglib_missing_font'] = 'Impossible trobar una font per a fer servir.';
$lang['imglib_save_failed'] = 'Impossible guardar la imatge. Siusplau comprova que el directori és escribible.';
diff --git a/vendor/codeigniter/framework/system/language/croatian/calendar_lang.php b/vendor/codeigniter/framework/system/language/croatian/calendar_lang.php
new file mode 100644
index 000000000..170c8c58a
--- /dev/null
+++ b/vendor/codeigniter/framework/system/language/croatian/calendar_lang.php
@@ -0,0 +1,57 @@
+
+
+
+ 403 Zabranjeno
+
+
+
+Zabranjen je pristup direktoriju.
+
+
+
diff --git a/vendor/codeigniter/framework/system/language/croatian/migration_lang.php b/vendor/codeigniter/framework/system/language/croatian/migration_lang.php
new file mode 100644
index 000000000..9d07d64c8
--- /dev/null
+++ b/vendor/codeigniter/framework/system/language/croatian/migration_lang.php
@@ -0,0 +1,20 @@
+
+
+
+ 403 Forbidden
+
+
+
+Directory access is forbidden.
+
+
+
diff --git a/vendor/codeigniter/framework/system/language/danish/migration_lang.php b/vendor/codeigniter/framework/system/language/danish/migration_lang.php
new file mode 100644
index 000000000..c54ece3bb
--- /dev/null
+++ b/vendor/codeigniter/framework/system/language/danish/migration_lang.php
@@ -0,0 +1,19 @@
+protocol = strtolower($this->protocol);
in_array($this->protocol, $this->_protocols, TRUE) OR $this->protocol = 'mail';
-
- if ($return === TRUE)
- {
- return $this->protocol;
- }
+ return $this->protocol;
}
// --------------------------------------------------------------------
@@ -932,25 +927,21 @@ class CI_Email {
/**
* Get Mail Encoding
*
- * @param bool
* @return string
*/
- protected function _get_encoding($return = TRUE)
+ protected function _get_encoding()
{
in_array($this->_encoding, $this->_bit_depths) OR $this->_encoding = '8bit';
foreach ($this->_base_charsets as $charset)
{
- if (strpos($charset, $this->charset) === 0)
+ if (strpos($this->charset, $charset) === 0)
{
$this->_encoding = '7bit';
}
}
- if ($return === TRUE)
- {
- return $this->_encoding;
- }
+ return $this->_encoding;
}
// --------------------------------------------------------------------
@@ -1829,14 +1820,15 @@ class CI_Email {
{
$this->_unwrap_specials();
- $method = '_send_with_'.$this->_get_protocol();
+ $protocol = $this->_get_protocol();
+ $method = '_send_with_'.$protocol;
if ( ! $this->$method())
{
- $this->_set_error_message('lang:email_send_failure_'.($this->_get_protocol() === 'mail' ? 'phpmail' : $this->_get_protocol()));
+ $this->_set_error_message('lang:email_send_failure_'.($protocol === 'mail' ? 'phpmail' : $protocol));
return FALSE;
}
- $this->_set_error_message('lang:email_sent', $this->_get_protocol());
+ $this->_set_error_message('lang:email_sent', $protocol);
return TRUE;
}
diff --git a/vendor/codeigniter/framework/system/libraries/Form_validation.php b/vendor/codeigniter/framework/system/libraries/Form_validation.php
index 4f679a17f..71d0e64b1 100644
--- a/vendor/codeigniter/framework/system/libraries/Form_validation.php
+++ b/vendor/codeigniter/framework/system/libraries/Form_validation.php
@@ -1229,9 +1229,9 @@ class CI_Form_validation {
*/
public function valid_email($str)
{
- if (function_exists('idn_to_ascii') && sscanf($str, '%[^@]@%s', $name, $domain) === 2)
+ if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
{
- $str = $name.'@'.idn_to_ascii($domain);
+ $str = $matches[1].'@'.idn_to_ascii($matches[2]);
}
return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
diff --git a/vendor/codeigniter/framework/system/libraries/Session/drivers/Session_redis_driver.php b/vendor/codeigniter/framework/system/libraries/Session/drivers/Session_redis_driver.php
index d260f7b82..e220a2951 100644
--- a/vendor/codeigniter/framework/system/libraries/Session/drivers/Session_redis_driver.php
+++ b/vendor/codeigniter/framework/system/libraries/Session/drivers/Session_redis_driver.php
@@ -51,7 +51,7 @@ class CI_Session_redis_driver extends CI_Session_driver implements SessionHandle
/**
* phpRedis instance
*
- * @var resource
+ * @var Redis
*/
protected $_redis;
diff --git a/vendor/codeigniter/framework/system/libraries/Table.php b/vendor/codeigniter/framework/system/libraries/Table.php
index fef9bb039..50c5e358b 100644
--- a/vendor/codeigniter/framework/system/libraries/Table.php
+++ b/vendor/codeigniter/framework/system/libraries/Table.php
@@ -435,7 +435,7 @@ class CI_Table {
/**
* Set table data from a database result object
*
- * @param CI_DB_result $db_result Database result object
+ * @param CI_DB_result $object Database result object
* @return void
*/
protected function _set_from_db_result($object)
diff --git a/vendor/codeigniter/framework/system/libraries/Xmlrpc.php b/vendor/codeigniter/framework/system/libraries/Xmlrpc.php
index c766a89c8..6fa791864 100644
--- a/vendor/codeigniter/framework/system/libraries/Xmlrpc.php
+++ b/vendor/codeigniter/framework/system/libraries/Xmlrpc.php
@@ -1886,7 +1886,7 @@ class XML_RPC_Values extends CI_Xmlrpc
public function serializeval($o)
{
$array = $o->me;
- list($value, $type) = array(reset($ar), key($array));
+ list($value, $type) = array(reset($array), key($array));
return "\n".$this->serializedata($type, $value)." \n";
}
diff --git a/vendor/codeigniter/framework/user_guide/.buildinfo b/vendor/codeigniter/framework/user_guide/.buildinfo
index 6058c96d8..4fae1d862 100644
--- a/vendor/codeigniter/framework/user_guide/.buildinfo
+++ b/vendor/codeigniter/framework/user_guide/.buildinfo
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 3c1b170e2d8544b1cf108267b2fe09fb
+config: 26766c5367ec136757ba3bc9ac329ad3
tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/vendor/codeigniter/framework/user_guide/DCO.html b/vendor/codeigniter/framework/user_guide/DCO.html
index 2332d0069..5d123a1d5 100644
--- a/vendor/codeigniter/framework/user_guide/DCO.html
+++ b/vendor/codeigniter/framework/user_guide/DCO.html
@@ -7,7 +7,7 @@
Developer’s Certificate of Origin 1.1 — CodeIgniter 3.1.4 documentation
+ Developer’s Certificate of Origin 1.1 — CodeIgniter 3.1.5 documentation
@@ -30,7 +30,7 @@
-
© Copyright 2014 - 2017, British Columbia Institute of Technology.
- Last updated on Mar 20, 2017.
+ Last updated on Jun 19, 2017.
@@ -485,7 +485,7 @@ this project or the open source license(s) involved.
@@ -3035,7 +3035,7 @@
© Copyright 2014 - 2017, British Columbia Institute of Technology.
- Last updated on Mar 20, 2017.
+ Last updated on Jun 19, 2017.
@@ -3056,7 +3056,7 @@
@@ -449,7 +449,7 @@ please make copies of them first.
Next
-
© Copyright 2014 - 2017, British Columbia Institute of Technology.
- Last updated on Mar 20, 2017.
+ Last updated on Jun 19, 2017.
@@ -480,7 +480,7 @@ please make copies of them first.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CodeIgniter
+
+
+
+
+
+
+
+
+
+
+
Upgrading from 3.1.4 to 3.1.5
+
Before performing an update you should take your site offline by
+replacing the index.php file with a static one.
+
+
Step 1: Update your CodeIgniter files
+
Replace all files and directories in your system/ directory.
+
+
Note
+
If you have any custom developed files in these directories,
+please make copies of them first.
+
+
+
+
+
+
+
+
+
+
+
+
+
+