Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[7981] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <tr...@us...> - 2011-10-26 20:44:40
|
Revision: 7981
http://xoops.svn.sourceforge.net/xoops/?rev=7981&view=rev
Author: trabis
Date: 2011-10-26 20:44:32 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
removing unnecessary 'includes'
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/xoopsmodel.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/uploader.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/calendarjs.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_edit.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_new.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_reply.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/readpmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/viewpmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/footer.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/lostpass.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/smilies/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/userrank/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/users.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/xoopsmodel.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/xoopsmodel.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/xoopsmodel.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -20,8 +20,6 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-include_once XOOPS_ROOT_PATH . '/kernel/object.php';
-
/**
* Factory for object handlers
*
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/uploader.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/uploader.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/uploader.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -220,9 +220,7 @@
$this->maxHeight = intval($maxHeight);
}
- if (!include_once $xoops->path('language/' . $xoops->config['language'] . '/uploader.php')) {
- include_once $xoops->path('language/english/uploader.php');
- }
+ xoops_loadLanguage('uploader');
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/calendarjs.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/calendarjs.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/calendarjs.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -3,7 +3,7 @@
exit();
}
$xoops = Xoops::getInstance();
-include_once XOOPS_ROOT_PATH . '/language/' . $xoops->config['language'] . '/calendar.php';
+xoops_loadLanguage('calendar');
?>
<link rel="stylesheet" type="text/css" media="all" href="<?php echo XOOPS_URL;?>/include/calendar-blue.css"/>
<script type="text/javascript" src="<?php echo XOOPS_URL . '/include/calendar.js';?>"></script>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_edit.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_edit.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_edit.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -67,9 +67,9 @@
$com_rootid = $comment->getVar('com_rootid');
if ($xoops->module->getVar('dirname') != 'system') {
- include $xoops->path('header.php');
+ $xoops->header();
include $xoops->path('include/comment_form.php');
- include $xoops->path('footer.php');
+ $xoops->footer();
} else {
xoops_cp_header();
include $xoops->path('include/comment_form.php');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_new.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_new.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_new.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -30,7 +30,7 @@
$com_itemid = isset($_GET['com_itemid']) ? intval($_GET['com_itemid']) : 0;
if ($com_itemid > 0) {
- include_once $xoops->path('header.php');
+ $xoops->header();
if (isset($com_replytitle)) {
if (isset($com_replytext)) {
echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
@@ -75,7 +75,5 @@
$com_text = '';
include_once $xoops->path('include/comment_form.php');
- include_once $xoops->path('footer.php');
-}
-
-?>
\ No newline at end of file
+ $xoops->footer();
+}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_reply.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_reply.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/comment_reply.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -67,11 +67,11 @@
$com_rootid = $comment->getVar('com_rootid');
$com_itemid = $comment->getVar('com_itemid');
-include_once $xoops->path('header.php');
+$xoops->header();
echo '<table cellpadding="4" cellspacing="1" width="98%" class="outer">
<tr><td class="head">' . $comment->getVar('com_title') . '</td></tr>
<tr><td><br />' . $r_text . '<br /></td></tr>
</table>';
include_once $xoops->path('include/comment_form.php');
-include_once $xoops->path('footer.php');
+$xoops->footer();
?>
\ No newline at end of file
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 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/common.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -279,10 +279,9 @@
unset($url_arr);
if (!$xoops->module || !$xoops->module->getVar('isactive')) {
- include_once $xoops->path('header.php');
+ $xoops->header();
echo '<h4>' . _MODULENOEXIST . '</h4>';
- include_once $xoops->path('footer.php');
- exit();
+ $xoops->footer();
}
/* @var $moduleperm_handler XoopsGrouppermHandler */
$moduleperm_handler = xoops_gethandler('groupperm');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/readpmsg.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/readpmsg.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/readpmsg.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -104,8 +104,7 @@
}
$start = !empty($_GET['start']) ? intval($_GET['start']) : 0;
$total_messages = !empty($_GET['total_messages']) ? intval($_GET['total_messages']) : 0;
-$xoopsOption['template_main'] = "pm_readpmsg.html";
-include $xoops->path('header.php');
+$xoops->header('pm_readpmsg.html');
if (!is_object($pm)) {
if ($_REQUEST['op'] == "out") {
@@ -174,5 +173,4 @@
$GLOBALS['xoopsTpl']->assign('next', $start + 1);
$GLOBALS['xoopsTpl']->assign('total_messages', $total_messages);
-include $GLOBALS['xoops']->path('footer.php');
-?>
\ No newline at end of file
+$xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/viewpmsg.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/pm/viewpmsg.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -19,14 +19,14 @@
*/
include_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'mainfile.php';
+$xoops = Xoops::getInstance();
if (!is_object($GLOBALS['xoopsUser'])) {
redirect_header(XOOPS_URL, 3, _NOPERM);
exit();
}
$xoopsConfig['module_cache'] = 0; //disable caching since the URL will be the same, but content different from one user to another
-$xoopsOption['template_main'] = "pm_viewpmsg.html";
-include $GLOBALS['xoops']->path('header.php');
+$xoops->header('pm_viewpmsg.html');
$valid_op_requests = array('out', 'save', 'in');
$_REQUEST['op'] = !empty($_REQUEST['op']) && in_array($_REQUEST['op'], $valid_op_requests) ? $_REQUEST['op'] : 'in' ;
@@ -39,7 +39,7 @@
$GLOBALS['xoopsTpl']->assign('errormsg', implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
} else if (empty($_REQUEST['ok'])) {
xoops_confirm(array('ok' => 1, 'delete_messages' => 1, 'op' => $_REQUEST['op'], 'msg_id'=> serialize(array_map("intval", $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE);
- include $GLOBALS['xoops']->path('footer.php');
+ $xoops->footer();
exit();
} else {
$_POST['msg_id'] = unserialize($_REQUEST['msg_id']);
@@ -102,8 +102,7 @@
$GLOBALS['xoopsTpl']->assign('errormsg', implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
} else if (empty($_REQUEST['ok'])) {
xoops_confirm(array('ok' => 1, 'empty_messages' => 1, 'op' => $_REQUEST['op']), $_SERVER['REQUEST_URI'], _PM_RUSUREEMPTY);
- include $GLOBALS['xoops']->path('footer.php');
- exit();
+ $xoops->footer();
} else {
if ($_POST['op'] == 'save') {
$crit_to = new CriteriaCompo(new Criteria('to_delete', 0));
@@ -225,6 +224,5 @@
$pmform->addElement($empty_button);
$pmform->addElement(new XoopsFormHidden('op', $_REQUEST['op']));
$pmform->assign($GLOBALS['xoopsTpl']);
-
-include $GLOBALS['xoops']->path('footer.php');
+$xoops->footer();
?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -19,10 +19,11 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
xoops_loadLanguage('admin');
-include $GLOBALS['xoops']->path('header.php');
+$xoops->header();
if (!empty($_GET['id']) && !empty($_GET['actkey'])) {
$id = intval($_GET['id']);
$actkey = trim($_GET['actkey']);
@@ -57,7 +58,7 @@
$xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
$xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
$xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $GLOBALS['xoopsConfig']['sitename']) );
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->footer();
if (!$xoopsMailer->send()) {
printf(_US_ACTVMAILNG, $thisuser->getVar('uname') );
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -63,7 +63,6 @@
$opform->display();
$module_id = $GLOBALS['xoopsModule']->getVar('mid');
-include_once $GLOBALS['xoops']->path( '/class/xoopsform/grouppermform.php' );
$form = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php', $anonymous);
if ( $op == "access" ) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -18,6 +18,7 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
xoops_loadLanguage('user');
@@ -28,8 +29,7 @@
redirect_header(XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . "/", 2, _NOPERM);
}
-$xoopsOption['template_main'] = 'profile_email.html';
-include $GLOBALS['xoops']->path('header.php');
+$xoops->header('profile_email.html');
if (!isset($_POST['submit']) || !isset($_POST['passwd'])) {
//show change password form
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changepass.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -19,13 +19,14 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
xoops_loadLanguage('user');
if (!$GLOBALS['xoopsUser']) {
redirect_header(XOOPS_URL, 2, _NOPERM);
}
-$xoopsOption['template_main'] = 'profile_changepass.html';
-include $GLOBALS['xoops']->path('header.php');
+$xoops->header('profile_changepass.html');
+
if (!isset($_POST['submit'])) {
//show change password form
$form = new XoopsThemeForm(_PROFILE_MA_CHANGEPASSWORD, 'form', $_SERVER['REQUEST_URI'], 'post', true);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -231,11 +231,7 @@
**/
function getOutputValue(&$user, $profile)
{
- if (file_exists($file = $GLOBALS['xoops']->path('modules/profile/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php'))) {
- include_once $file;
- } else {
- include_once $GLOBALS['xoops']->path('modules/profile/language/english/modinfo.php');
- }
+ xoops_loadLanguage('modinfo', 'profile');
$value = in_array($this->getVar('field_name'), $this->getUserVars() ) ? $user->getVar($this->getVar('field_name') ) : $profile->getVar($this->getVar('field_name'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -19,6 +19,7 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
xoops_loadLanguage('user');
// If not a user, redirect
@@ -88,8 +89,7 @@
if ($op == 'editprofile') {
- $xoopsOption['template_main'] = 'profile_editprofile.html';
- include_once $GLOBALS['xoops']->path('header.php');
+ $xoops->header('profile_editprofile.html');
include_once dirname(__FILE__) . '/include/forms.php';
$form = profile_getUserForm($GLOBALS['xoopsUser']);
$form->assign($GLOBALS['xoopsTpl']);
@@ -101,8 +101,7 @@
}
if ($op == 'avatarform') {
- $xoopsOption['template_main'] = 'profile_avatar.html';
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header('profile_avatar.html');
$xoBreadcrumbs[] = array('title' => _US_MYAVATAR);
$oldavatar = $GLOBALS['xoopsUser']->getVar('user_avatar');
@@ -224,10 +223,9 @@
$GLOBALS['xoopsUser']->setVar('user_avatar', $user_avatar);
$member_handler = xoops_gethandler('member');
if (!$member_handler->insertUser($GLOBALS['xoopsUser'])) {
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header();
echo $GLOBALS['xoopsUser']->getHtmlErrors();
- include $GLOBALS['xoops']->path('footer.php');
- exit();
+ $xoops->footer();
}
if ($oldavatar && preg_match("/^cavt/", strtolower(substr($oldavatar,8)))) {
$avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/footer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/footer.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/footer.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -17,10 +17,8 @@
* @author Taiwen Jiang <ph...@us...>
* @version $Id$
*/
-
+$xoops = Xoops::getInstance();
if (count($xoBreadcrumbs) > 1) {
- $GLOBALS['xoopsTpl']->assign('xoBreadcrumbs', $xoBreadcrumbs);
+ $xoops->tpl->assign('xoBreadcrumbs', $xoBreadcrumbs);
}
-
-include $GLOBALS['xoops']->path('footer.php');
-?>
\ No newline at end of file
+include $xoops->footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/index.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -19,6 +19,7 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
xoops_loadLanguage('user');
$op = 'main';
@@ -31,8 +32,7 @@
if ($op == 'main') {
if (!$GLOBALS['xoopsUser']) {
- $xoopsOption['template_main'] = 'system_userform.html';
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header('system_userform.html');
$GLOBALS['xoopsTpl']->assign('lang_login', _LOGIN);
$GLOBALS['xoopsTpl']->assign('lang_username', _USERNAME);
if (isset($_GET['xoops_redirect'])) {
@@ -49,7 +49,6 @@
$GLOBALS['xoopsTpl']->assign('lang_sendpassword', _US_SENDPASSWORD);
$GLOBALS['xoopsTpl']->assign('mailpasswd_token', $GLOBALS['xoopsSecurity']->createToken());
include 'footer.php';
- exit();
}
if (!empty($_GET['xoops_redirect']) ) {
$redirect = trim($_GET['xoops_redirect']);
@@ -112,7 +111,7 @@
}
$ok = !isset($_POST['ok']) ? 0 : intval($_POST['ok']);
if ($ok != 1) {
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header();
xoops_confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL . '<br/>' . _US_REMOVEINFO);
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/lostpass.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/lostpass.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/lostpass.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -61,7 +61,7 @@
// Next step: add the new password to the database
$sql = sprintf("UPDATE %s SET pass = '%s' WHERE uid = %u", $GLOBALS['xoopsDB']->prefix("users"), md5($newpass), $user->getVar('uid') );
if (!$GLOBALS['xoopsDB']->queryF($sql)) {
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header();
echo _US_MAILPWDNG;
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
exit();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -20,6 +20,7 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
if ($GLOBALS['xoopsUser']) {
header('location: userinfo.php?uid= ' . $GLOBALS['xoopsUser']->getVar('uid'));
@@ -65,8 +66,7 @@
$steps[$key]['step_no'] = $key + 1;
}
-$xoopsOption['template_main'] = 'profile_register.html';
-include $GLOBALS['xoops']->path('header.php');
+$xoops->header('profile_register.html');
$GLOBALS['xoopsTpl']->assign('steps', $steps);
$GLOBALS['xoopsTpl']->assign('lang_register_steps', _PROFILE_MA_REGISTER_STEPS);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/search.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -19,6 +19,7 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
$myts = MyTextSanitizer::getInstance();
$limit_default = 20;
@@ -38,8 +39,7 @@
default:
case "search":
$xoopsOption['cache_group'] = implode('', $groups);
- $xoopsOption['template_main'] = "profile_search.html";
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header('profile_search.html');
$xoBreadcrumbs[] = array('title' => _SEARCH);
$sortby_arr = array();
@@ -155,8 +155,7 @@
break;
case "results":
- $xoopsOption['template_main'] = "profile_results.html";
- include_once $GLOBALS['xoops']->path('header.php');
+ $xoops->header('profile_results.html');
$GLOBALS['xoopsTpl']->assign('page_title', _PROFILE_MA_RESULTS);
$xoBreadcrumbs[] = array('link' => XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/search.php', 'title' => _SEARCH);
$xoBreadcrumbs[] = array('title' => _PROFILE_MA_RESULTS);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -19,6 +19,7 @@
*/
include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+$xoops = Xoops::getInstance();
include_once $GLOBALS['xoops']->path('modules/system/constants.php');
$uid = intval($_GET['uid']);
@@ -37,8 +38,7 @@
if (is_object($GLOBALS['xoopsUser']) && $uid == $GLOBALS['xoopsUser']->getVar('uid')) {
//disable cache
$GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
- $xoopsOption['template_main'] = 'profile_userinfo.html';
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header('profile_userinfo.html');
$config_handler = xoops_gethandler('config');
$GLOBALS['xoopsConfigUser'] = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
@@ -106,8 +106,7 @@
//disable cache
$GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
}
- $xoopsOption['template_main'] = 'profile_userinfo.html';
- include $GLOBALS['xoops']->path('header.php');
+ $xoops->header('profile_userinfo.html');
$GLOBALS['xoopsTpl']->assign('user_ownpage', false);
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/avatars/main.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -171,8 +171,6 @@
}
$config_handler = xoops_gethandler( 'config' );
$xoopsConfigUser = $config_handler->getConfigsByCat( XOOPS_CONF_USER );
- // Upload class
- include_once $GLOBALS['xoops']->path( '/class/uploader.php' );
$uploader = new XoopsMediaUploader( XOOPS_UPLOAD_PATH . '/avatars', array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), $xoopsConfigUser['avatar_maxsize'], $xoopsConfigUser['avatar_width'], $xoopsConfigUser['avatar_height']);
// Get avatar handler
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/main.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -309,7 +309,6 @@
}
if ( $comments_count > $comments_limit ) {
- include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($comments_count, $comments_limit, $comments_start, 'comments_start', 'fct=comments&comments_module='.$comments_module.'&comments_status='.$comments_status);
$xoopsTpl->assign( 'nav', $nav->renderNav() );
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/modulesadmin.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -94,7 +94,6 @@
$error = true;
} else {
$msgs[] = "<p>" . sprintf(_AM_SYSTEM_MODULES_SQL_FOUND, "<strong>{$sql_file_path}</strong>") . "<br />" . _AM_SYSTEM_MODULES_CREATE_TABLES;
- include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
$sql_query = fread(fopen($sql_file_path, 'r'), filesize($sql_file_path));
$sql_query = trim($sql_query);
SqlUtility::splitMySqlFile($pieces, $sql_query);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -323,23 +323,19 @@
break;
case 'group':
- include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
$ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
break;
case 'group_multi':
- include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
$ele = new XoopsFormSelectGroup($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
break;
// RMV-NOTIFY: added 'user' and 'user_multi'
case 'user':
- include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
$ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 1, false);
break;
case 'user_multi':
- include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
$ele = new XoopsFormSelectUser($title, $config[$i]->getVar('conf_name'), false, $config[$i]->getConfValueForOutput(), 5, true);
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/smilies/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/smilies/main.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/smilies/main.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -152,7 +152,6 @@
$display = ($_POST["display"] == 1) ? "1" : "0";
$obj->setVar("display", $display);
- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$uploader_smilies_img = new XoopsMediaUploader( XOOPS_UPLOAD_PATH . '/smilies', $mimetypes, $upload_size, null, null);
if ($uploader_smilies_img->fetchMedia("smile_url")) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/userrank/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/userrank/main.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/userrank/main.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -150,7 +150,6 @@
$verif_rank_special = ($_POST["rank_special"] == 1) ? "1" : "0";
$obj->setVar("rank_special", $verif_rank_special);
- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$uploader_rank_img = new XoopsMediaUploader( XOOPS_UPLOAD_PATH . '/ranks', $mimetypes, $upload_size, null, null);
if ($uploader_rank_img->fetchMedia("rank_image")) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/main.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -875,7 +875,6 @@
}
if ($users_count > $user_limit) {
- include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
$nav = new XoopsPageNav($users_count, $user_limit, $start, 'start', 'fct=users&op=default'.$requete_pagenav);
$xoopsTpl->assign( 'nav', $nav->renderNav() );
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/users/users.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -47,8 +47,8 @@
$uid = system_CleanVars($_REQUEST, 'uid', 0);
//RMV-NOTIFY
- include_once XOOPS_ROOT_PATH. '/language/' . $xoopsConfig['language'] . '/notification.php';
- include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+ xoops_loadLanguage('notification');
+ include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
if ( $add_or_edit == true )
{
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -433,7 +433,7 @@
{
global $xoopsConfig, $xoopsUser, $xoopsModule;
include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
- include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/notification.php';
+ xoops_loadLanguage('notification');
// Notification must be enabled, and user must be logged in
if (empty($xoopsUser) || !notificationEnabled('block')) {
return false; // do not display block
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/avatar.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/avatar.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/avatar.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -17,8 +17,6 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-include_once $GLOBALS['xoops']->path( '/kernel/avatar.php' );
-
/**
* System Avatar
*
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/group.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -21,8 +21,6 @@
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-include_once XOOPS_ROOT_PATH . '/kernel/group.php';
-
/**
* System Group
*
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/users.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/users.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/users.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -16,8 +16,6 @@
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-include_once XOOPS_ROOT_PATH . '/kernel/user.php';
-
/**
* System Users
*
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2011-10-26 20:11:53 UTC (rev 7980)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2011-10-26 20:44:32 UTC (rev 7981)
@@ -198,7 +198,6 @@
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
$i++;
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
$icons = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/icons');
$modversion['config'][$i]['name'] = 'typeicons';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ICONS';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
