Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10330] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <tr...@us...> - 2012-12-08 19:11:40
|
Revision: 10330
http://sourceforge.net/p/xoops/svn/10330
Author: trabis
Date: 2012-12-08 19:11:36 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Finishing adding the necessary preloads for logger events.
Adding method to disable php error reporting with an event attached
Preparing protector to use an eventual logger module to dump queries
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/comments.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/footer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/cp_functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/formdhtmltextarea_preview.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/core.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Pdf.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/backend.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -21,7 +21,7 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
$xoops = Xoops::getInstance();
-$xoops->logger()->disable();
+$xoops->disableErrorReporting();
if (function_exists('mb_http_output')) {
mb_http_output('pass');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/comments.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/comments.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/comments.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -33,7 +33,7 @@
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
$xoops = Xoops::getInstance();
-$xoops->logger()->disable();
+$xoops->disableErrorReporting();
if (function_exists('mb_http_output')) {
mb_http_output('pass');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/footer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/footer.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/footer.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -23,5 +23,5 @@
$xoops = Xoops::getInstance();
$xoops->preload()->triggerEvent('core.include.footer');
-$xoops->logger()->addDeprecated("include 'footer.php' is deprecated since 2.6.0, use Xoops::getInstance()->footer(); instead");
+$xoops->deprecated("include 'footer.php' is deprecated since 2.6.0, use Xoops::getInstance()->footer(); instead");
$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/header.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/header.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -25,5 +25,5 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
$xoops = Xoops::getInstance();
-$xoops->logger()->addDeprecated("include 'header.php' is deprecated since 2.6.0, use Xoops::getInstance()->header(); instead");
+$xoops->deprecated("include 'header.php' is deprecated since 2.6.0, use Xoops::getInstance()->header(); instead");
$xoops->header($xoops->getOption('template_main'));
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/image.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -19,7 +19,6 @@
* @version $Id$
*/
-error_reporting(0);
if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime(0);
}
@@ -40,7 +39,7 @@
include_once XOOPS_ROOT_PATH . '/class/xoopsload.php';
$xoops = Xoops::getInstance();
-$xoops->logger()->startTime();
+$xoops->disableErrorReporting();
define('XOOPS_DB_PROXY', 1);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -110,6 +110,8 @@
trigger_error('File Path Error: ' . 'var/configs/xoopsconfig.php' . ' does not exist.');
}
+$xoopsPreload->triggerEvent('core.include.common.configs.success');
+
/**
* Enable Gzip compression,
* Requires configs loaded and should go before any output
@@ -117,17 +119,6 @@
$xoops->gzipCompression();
/**
- * Start of Error Reportings.
- */
-if ($xoops->getConfig('debug_mode') == 1 || $xoops->getConfig('debug_mode') == 2) {
- $xoops->loadLanguage('logger');
- $xoops->logger()->enable();
- $xoops->logger()->usePopup = ($xoops->getConfig('debug_mode') == 2);
-} else {
- $xoops->logger()->disable();
-}
-
-/**
* Check Bad Ip Addressed against database and block bad ones, requires configs loaded
*/
$xoops->security()->checkBadips();
@@ -211,20 +202,7 @@
}
}
-/**
- * *#@+
- * Debug level for XOOPS
- * Check /xoops_data/configs/xoopsconfig.php for details
- *
- * Note: temporary solution only. Will be re-designed in XOOPS 3.0
- */
-if ($xoops->logger()->isEnable()) {
- $level = $xoops->getConfig('debugLevel') ? $xoops->getConfig('debugLevel') : 0;
- if (($level == 2 && !$xoops->userIsAdmin) || ($level == 1 && !$xoops->isUser())) {
- $xoops->logger()->disable();
- }
- unset($level);
-}
+$xoopsPreload->triggerEvent('core.include.common.auth.success');
/**
* Theme Selection
@@ -289,6 +267,4 @@
//Creates 'system_modules_active' cache file if it has been deleted.
$xoops->getActiveModules();
-$xoops->logger()->stopTime('XOOPS Boot');
-$xoops->logger()->startTime('Module init');
$xoops->preload()->triggerEvent('core.include.common.end');
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/cp_functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/cp_functions.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/cp_functions.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -25,7 +25,7 @@
function xoops_cp_header()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated('xoops_cp_header() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated('xoops_cp_header() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->header($xoops->getOption('template_main'));
}
@@ -36,6 +36,6 @@
function xoops_cp_footer()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated('xoops_cp_footer() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated('xoops_cp_footer() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->footer($xoops->getOption('template_main'));
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/formdhtmltextarea_preview.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/formdhtmltextarea_preview.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/formdhtmltextarea_preview.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -21,7 +21,7 @@
include_once dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'mainfile.php';
$xoops = Xoops::getInstance();
-$xoops->logger()->disable();
+$xoops->disableErrorReporting();
$myts = MyTextSanitizer::getInstance();
$content = $myts->stripSlashesGPC($_POST['text']);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/functions.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -27,7 +27,7 @@
function xoops_getHandler($name, $optional = false)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated('xoops_getHandler(\'' . $name . '\') is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated('xoops_getHandler(\'' . $name . '\') is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$method = 'getHandler' . ucfirst(strtolower(trim($name)));
return $xoops->$method($optional);
}
@@ -42,7 +42,7 @@
function xoops_getModuleHandler($name = null, $module_dir = null, $optional = false)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getModuleHandler($name, $module_dir, $optional);
}
@@ -55,7 +55,7 @@
function xoops_load($name, $type = 'core')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return XoopsLoad::load($name, $type);
}
@@ -71,7 +71,7 @@
function xoops_loadLanguage($name, $domain = '', $language = null)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->loadLanguage($name, $domain, $language);
}
@@ -82,7 +82,7 @@
function xoops_getActiveModules()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getActiveModules();
}
@@ -93,7 +93,7 @@
function xoops_setActiveModules()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->setActiveModules();
}
@@ -105,7 +105,7 @@
function xoops_isActiveModule($dirname)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->isActiveModule($dirname);
}
@@ -117,7 +117,7 @@
function xoops_header($closehead = true)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->simpleHeader($closehead);
}
@@ -128,7 +128,7 @@
function xoops_footer()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->simpleFooter();
}
@@ -141,7 +141,7 @@
function xoops_error($msg, $title = '')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->error($msg, $title);
}
@@ -154,7 +154,7 @@
function xoops_result($msg, $title = '')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->result($msg, $title);
}
@@ -170,7 +170,7 @@
function xoops_confirm($hiddens, $action, $msg, $submit = '', $addtoken = true)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->confirm($hiddens, $action, $msg, $submit, $addtoken);
}
@@ -183,7 +183,7 @@
function xoops_getUserTimestamp($time, $timeoffset = '')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getUserTimestamp($time, $timeoffset);
}
@@ -197,7 +197,7 @@
function formatTimestamp($time, $format = 'l', $timeoffset = '')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return XoopsLocal::formatTimestamp($time, $format, $timeoffset);
}
@@ -210,7 +210,7 @@
function userTimeToServerTime($timestamp, $userTZ = null)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->userTimeToServerTime($timestamp, $userTZ);
}
@@ -221,7 +221,7 @@
function xoops_makepass()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->makePass();
}
@@ -234,7 +234,7 @@
function checkEmail($email, $antispam = false)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->checkEmail($email, $antispam);
}
@@ -246,7 +246,7 @@
function formatURL($url)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->formatURL($url);
}
@@ -257,7 +257,7 @@
function xoops_getbanner()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getBanner();
}
@@ -273,7 +273,7 @@
function redirect_header($url, $time = 3, $message = '', $addredirect = true, $allowExternalLink = false)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->redirect($url, $time, $message, $addredirect, $allowExternalLink);
}
@@ -285,7 +285,7 @@
function xoops_getenv($key)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getEnv($key);
}
@@ -297,7 +297,7 @@
function xoops_getcss($theme = '')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getCss($theme);
}
@@ -308,7 +308,7 @@
function xoops_getMailer()
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getMailer();
}
@@ -321,7 +321,7 @@
function xoops_getrank($rank_id = 0, $posts = 0)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getRank($rank_id, $posts);
}
@@ -336,7 +336,7 @@
function xoops_substr($str, $start, $length, $trimmarker = '...')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return XoopsLocal::substr($str, $start, $length, $trimmarker);
}
@@ -348,7 +348,7 @@
function xoops_notification_deletebymodule($module_id)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getHandlerNotification()->unsubscribeByModule($module_id);
}
@@ -360,7 +360,7 @@
function xoops_notification_deletebyuser($user_id)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getHandlerNotification()->unsubscribeByUser($user_id);
}
@@ -374,7 +374,7 @@
function xoops_notification_deletebyitem($module_id, $category, $item_id)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getHandlerNotification()->unsubscribeByItem($module_id, $category, $item_id);
}
@@ -387,7 +387,7 @@
function xoops_comment_count($module_id, $item_id = null)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getHandlerComment()->getCountByModuleId($module_id, $item_id);
}
@@ -400,7 +400,7 @@
function xoops_comment_delete($module_id, $item_id)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getHandlerComment()->deleteByItemId($module_id, $item_id);
}
@@ -414,7 +414,7 @@
function xoops_groupperm_deletebymoditem($module_id, $perm_name, $item_id = null)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getHandlerGroupperm()->deleteByModule($module_id, $perm_name, $item_id);
}
@@ -426,7 +426,7 @@
function xoops_utf8_encode(&$text)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
XoopsLocal::utf8_encode($text);
}
@@ -438,7 +438,7 @@
function xoops_convert_encoding(&$text)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
XoopsLocal::utf8_encode($text);
}
@@ -450,7 +450,7 @@
function xoops_trim($text)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return XoopsLocal::trim($text);
}
@@ -462,7 +462,7 @@
function xoops_getOption($option)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getOption($option);
}
@@ -475,7 +475,7 @@
function xoops_getConfigOption($option, $type = 'XOOPS_CONF')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getConfig($option, $type);
}
@@ -488,7 +488,7 @@
function xoops_setConfigOption($option, $new = null)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->setConfig($option, $new);
}
@@ -501,7 +501,7 @@
function xoops_getModuleOption($option, $dirname = '')
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getModuleConfig($option, $dirname);
}
@@ -514,7 +514,7 @@
function xoops_getBaseDomain($url, $debug = 0)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getBaseDomain($url, $debug);
}
@@ -526,7 +526,7 @@
function xoops_getUrlDomain($url)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->getUrlDomain($url);
}
@@ -540,7 +540,7 @@
function xoops_template_touch($tpl_id, $clear_old = true)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
return $xoops->templateTouch($tpl_id);
}
@@ -553,6 +553,6 @@
function xoops_template_clear_module_cache($mid)
{
$xoops = Xoops::getInstance();
- $xoops->logger()->addDeprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+ $xoops->deprecated(__FUNCTION__ . ' is deprecated since XOOPS 2.6.0. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
$xoops->templateClearModuleCache($mid);
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/admin/prefix_manager.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -23,6 +23,7 @@
require_once dirname(dirname(__FILE__)) . '/class/gtickets.php';
$db = XoopsDatabaseFactory::getDatabaseConnection();
+$xoops = Xoops::getInstance();
$xoops->header('protector_prefix.html');
$error = '';
@@ -82,7 +83,9 @@
}
}
- $_SESSION['protector_logger'] = $xoops->logger()->dump('queries');
+ if ($xoops->isActiveModule('logger')) {
+ $_SESSION['protector_logger'] = Logger::getInstance()->dump('queries');
+ }
if ( $error != '' ) {
$xoops->tpl()->assign('error', $error);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -88,7 +88,7 @@
break;
case 'rename':
- $xoops->logger()->disable();
+ $xoops->disableErrorReporting();
$mid = $system->cleanVars($_POST, 'id', 0, 'int');
$value = $system->cleanVars($_POST, 'value', '', 'string');
@@ -125,7 +125,7 @@
break;
case 'active':
- $xoops->logger()->disable();
+ $xoops->disableErrorReporting();
// Get module handler
$module_handler = $xoops->getHandlerModule();
$block_handler = $xoops->getHandlerBlock();
@@ -151,7 +151,7 @@
break;
case 'display_in_menu':
- $xoops->logger()->disable();
+ $xoops->disableErrorReporting();
// Get module handler
$module_handler = $xoops->getHandlerModule();
$module_id = $system->cleanVars($_POST, 'mid', 0, 'int');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/tplsets/jquery.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -22,13 +22,12 @@
include dirname(dirname(dirname(__FILE__))) . '/header.php';
$xoops = Xoops::getInstance();
+$xoops->disableErrorReporting();
if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
exit(_NOPERM);
}
-$xoops->logger()->disable();
-
include_once $xoops->path('modules/system/functions.php');
system_loadLanguage('tplsets', 'system');
@@ -38,8 +37,6 @@
@$op = "default";
}
-$xoops->logger()->usePopup = true;
-
switch ($op) {
// Display tree folder
case "tpls_display_folder":
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/jquery.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -28,7 +28,7 @@
exit(_NOPERM);
}
-$xoops->logger()->disable();
+$xoops->disableErrorReporting();
if (isset($_REQUEST["op"])) {
$op = $_REQUEST["op"];
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/core.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/core.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/core.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -164,4 +164,47 @@
$isCached = $args[1];
XoopsLogger::getInstance()->addBlock($block->getVar('name'), $isCached, $block->getVar('bcachetime'));
}
+
+ static function eventCoreDeprecated($args)
+ {
+ $message = $args[0];
+ XoopsLogger::getInstance()->addDeprecated($message);
+ }
+
+ static function eventCoreDisableerrorreporting($args)
+ {
+ XoopsLogger::getInstance()->disable();
+ }
+
+ static function eventCoreIncludeCommonConfigsSuccess($args)
+ {
+ $xoops = Xoops::getInstance();
+ $logger = XoopsLogger::getInstance();
+ if ($xoops->getConfig('debug_mode') == 1 || $xoops->getConfig('debug_mode') == 2) {
+ $xoops->loadLanguage('logger');
+ $logger->enable();
+ $logger->usePopup = ($xoops->getConfig('debug_mode') == 2);
+ } else {
+ $xoops->disableErrorReporting();
+ }
+ }
+
+ static function eventCoreIncludeCommonAuthSuccess($args)
+ {
+ $xoops = Xoops::getInstance();
+ $logger = XoopsLogger::getInstance();
+ if ($logger->isEnable()) {
+ $level = $xoops->getConfig('debugLevel') ? $xoops->getConfig('debugLevel') : 0;
+ if (($level == 2 && !$xoops->userIsAdmin) || ($level == 1 && !$xoops->isUser())) {
+ $xoops->disableErrorReporting();
+ }
+ }
+ }
+
+ static function eventCoreIncludeEnd($args)
+ {
+ $logger = XoopsLogger::getInstance();
+ $logger->stopTime('XOOPS Boot');
+ $logger->startTime('Module init');
+ }
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Pdf.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Pdf.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops/Pdf.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -43,7 +43,7 @@
))
{
$xoops = Xoops::getInstance();
- $xoops->logger()->disable();
+ $xoops->disableErrorReporting();
parent::__construct($orientation, $format, $langue, $unicode, $encoding, $marges = array(5, 5, 5, 8));
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php 2012-12-08 01:46:05 UTC (rev 10329)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/Xoops.php 2012-12-08 19:11:36 UTC (rev 10330)
@@ -1857,4 +1857,23 @@
}
return $aReturn;
}
+
+ /**
+ * Support for deprecated messages events
+ *
+ * @param $message
+ */
+ public function deprecated($message)
+ {
+ $this->preload()->triggerEvent('core.deprecated', array($message));
+ }
+
+ /**
+ * Support for disabling error reporting
+ */
+ public function disableErrorReporting()
+ {
+ error_reporting(0);
+ $this->preload()->triggerEvent('core.disableerrorreporting');
+ }
}
\ No newline at end of file
|
