aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/web/libraries/REST_Controller.php18
-rw-r--r--apps/web/views/_navbar_left_list_alt.php2
-rw-r--r--apps/web/views/errors/cli/error_exception.php4
-rw-r--r--apps/web/views/errors/cli/error_php.php4
-rw-r--r--apps/web/views/errors/html/error_exception.php4
-rw-r--r--apps/web/views/errors/html/error_php.php4
6 files changed, 18 insertions, 18 deletions
diff --git a/apps/web/libraries/REST_Controller.php b/apps/web/libraries/REST_Controller.php
index f9314bb..aa702ed 100644
--- a/apps/web/libraries/REST_Controller.php
+++ b/apps/web/libraries/REST_Controller.php
@@ -217,7 +217,7 @@ abstract class REST_Controller extends CI_Controller {
parent::__construct();
// Disable XML Entity (security vulnerability)
- libxml_disable_entity_loader(TRUE);
+ @libxml_disable_entity_loader(TRUE);
// Check to see if PHP is equal to or greater than 5.4.x
if (is_php('5.4') === FALSE)
@@ -530,7 +530,7 @@ abstract class REST_Controller extends CI_Controller {
if (extension_loaded('zlib'))
{
$http_encoding = $this->input->server('HTTP_ACCEPT_ENCODING');
- if ($http_encoding !== NULL && strpos($http_encoding, 'gzip') !== FALSE)
+ if ($http_encoding !== NULL && @strpos($http_encoding, 'gzip') !== FALSE)
{
ob_start('ob_gzhandler');
}
@@ -620,7 +620,7 @@ abstract class REST_Controller extends CI_Controller {
// If a semi-colon exists in the string, then explode by ; and get the value of where
// the current array pointer resides. This will generally be the first element of the array
- $contentType = (strpos($contentType, ';') !== FALSE ? current(explode(';', $contentType)) : $contentType);
+ $contentType = (@strpos($contentType, ';') !== FALSE ? current(explode(';', $contentType)) : $contentType);
// If both the mime types match, then return the format
if ($contentType === $value)
@@ -678,7 +678,7 @@ abstract class REST_Controller extends CI_Controller {
foreach (array_keys($this->_supported_formats) as $format)
{
// Has this format been requested?
- if (strpos($this->input->server('HTTP_ACCEPT'), $format) !== FALSE)
+ if (@strpos($this->input->server('HTTP_ACCEPT'), $format) !== FALSE)
{
// If not HTML or XML assume its right and send it on its way
if ($format !== 'html' && $format !== 'xml')
@@ -690,13 +690,13 @@ abstract class REST_Controller extends CI_Controller {
else
{
// If it is truly HTML, it wont want any XML
- if ($format == 'html' && strpos($this->input->server('HTTP_ACCEPT'), 'xml') === FALSE)
+ if ($format == 'html' && @strpos($this->input->server('HTTP_ACCEPT'), 'xml') === FALSE)
{
return $format;
}
// If it is truly XML, it wont want any HTML
- elseif ($format == 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
+ elseif ($format == 'xml' && @strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
{
return $format;
}
@@ -834,7 +834,7 @@ abstract class REST_Controller extends CI_Controller {
}
// They might have sent a few, make it an array
- if (strpos($lang, ',') !== FALSE)
+ if (@strpos($lang, ',') !== FALSE)
{
$langs = explode(',', $lang);
@@ -905,7 +905,7 @@ abstract class REST_Controller extends CI_Controller {
$limit = $this->methods[$controller_method]['limit'];
$uri_noext = $this->uri->uri_string();
- if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0)
+ if (@strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0)
{
$uri_noext = substr($this->uri->uri_string(),0, -strlen($this->response->format)-1);
}
@@ -1644,7 +1644,7 @@ abstract class REST_Controller extends CI_Controller {
{
// If the authentication header is set as basic, then extract the username and password from
// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file
- if (strpos(strtolower($http_auth), 'basic') === 0)
+ if (@strpos(strtolower($http_auth), 'basic') === 0)
{
// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing
list($username, $password) = explode(':', base64_decode(substr($this->input->server('HTTP_AUTHORIZATION'), 6)));
diff --git a/apps/web/views/_navbar_left_list_alt.php b/apps/web/views/_navbar_left_list_alt.php
index fcd2922..be9ee00 100644
--- a/apps/web/views/_navbar_left_list_alt.php
+++ b/apps/web/views/_navbar_left_list_alt.php
@@ -46,5 +46,5 @@ $spacing=''; //use css
<?php echo $divlast;?>
<?php endforeach;?>
<?php //echo $ncatcount;?>
-</div><span id="data-total" data-total=<?php echo $t;?>></span>
+</div><span id="data-total" data-total=<?php echo @$t;?>></span>
diff --git a/apps/web/views/errors/cli/error_exception.php b/apps/web/views/errors/cli/error_exception.php
index 75d7f0f..b756225 100644
--- a/apps/web/views/errors/cli/error_exception.php
+++ b/apps/web/views/errors/cli/error_exception.php
@@ -13,7 +13,7 @@ Line Number: <?php echo $exception->getLine(); ?>
Backtrace:
<?php foreach ($exception->getTrace() as $error): ?>
- <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+ <?php if (isset($error['file']) && @strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
File: <?php echo $error['file']; ?>
Line: <?php echo $error['line']; ?>
@@ -22,4 +22,4 @@ Backtrace:
<?php endif ?>
<?php endforeach ?>
-<?php endif ?> \ No newline at end of file
+<?php endif ?>
diff --git a/apps/web/views/errors/cli/error_php.php b/apps/web/views/errors/cli/error_php.php
index fec91e5..7982db9 100644
--- a/apps/web/views/errors/cli/error_php.php
+++ b/apps/web/views/errors/cli/error_php.php
@@ -13,7 +13,7 @@ Line Number: <?php echo $line;?>
Backtrace:
<?php foreach (debug_backtrace() as $error): ?>
- <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+ <?php if (isset($error['file']) && @strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
File: <?php echo $error['file'];?>
Line: <?php echo $error['line'];?>
@@ -22,4 +22,4 @@ Backtrace:
<?php endif ?>
<?php endforeach ?>
-<?php endif ?> \ No newline at end of file
+<?php endif ?>
diff --git a/apps/web/views/errors/html/error_exception.php b/apps/web/views/errors/html/error_exception.php
index 8784886..4133d61 100644
--- a/apps/web/views/errors/html/error_exception.php
+++ b/apps/web/views/errors/html/error_exception.php
@@ -16,7 +16,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<p>Backtrace:</p>
<?php foreach ($exception->getTrace() as $error): ?>
- <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+ <?php if (isset($error['file']) && @strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
<p style="margin-left:10px">
File: <?php echo $error['file']; ?><br />
@@ -29,4 +29,4 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<?php endif ?>
-</div> \ No newline at end of file
+</div>
diff --git a/apps/web/views/errors/html/error_php.php b/apps/web/views/errors/html/error_php.php
index b146f9c..474dd67 100644
--- a/apps/web/views/errors/html/error_php.php
+++ b/apps/web/views/errors/html/error_php.php
@@ -16,7 +16,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<p>Backtrace:</p>
<?php foreach (debug_backtrace() as $error): ?>
- <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
+ <?php if (isset($error['file']) && @strpos($error['file'], realpath(BASEPATH)) !== 0): ?>
<p style="margin-left:10px">
File: <?php echo $error['file'] ?><br />
@@ -30,4 +30,4 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<?php endif ?>
-</div> \ No newline at end of file
+</div>