Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10077] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <for...@us...> - 2012-08-15 13:04:24
|
Revision: 10077
http://xoops.svn.sourceforge.net/xoops/?rev=10077&view=rev
Author: forxoops
Date: 2012-08-15 13:04:17 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
Fix some errors for alpha release
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/include/searchform.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/ProtectorFilter.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/protector.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoops.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -371,7 +371,7 @@
*
* @return bool
*/
- public function header($tpl_name = '')
+ public function header($tpl_name = null)
{
if ($this->isAdminSide) {
return $this->_adminHeader($tpl_name);
@@ -390,6 +390,10 @@
if ($tpl_name) {
$tpl_info = $this->getTplInfo($tpl_name);
$this->tpl_name = $tpl_info['tpl_name'];
+ } else {
+ $tpl_name = 'system_dummy.html';
+ $tpl_info = $this->getTplInfo($tpl_name);
+ $this->tpl_name = $tpl_info['tpl_name'];
}
// for legacy support when template is set after header.
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/edituser.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -260,7 +260,7 @@
$form->addElement(new XoopsFormHidden('op', 'avatarupload'));
$form->addElement(new XoopsFormHidden('uid', $xoops->user->getVar('uid')));
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- $form->display();
+ $form->render(false);
}
$avatar_handler = $xoops->getHandlerAvatar();
$form2 = new XoopsThemeForm(_US_CHOOSEAVT, 'uploadavatar', 'edituser.php', 'post', true);
@@ -278,7 +278,7 @@
$form2->addElement(new XoopsFormHidden('uid', $xoops->user->getVar('uid')));
$form2->addElement(new XoopsFormHidden('op', 'avatarchoose'));
$form2->addElement(new XoopsFormButton('', 'submit2', _SUBMIT, 'submit'));
- $form2->display();
+ $form2->render(false);
$xoops->footer();
}
@@ -302,7 +302,7 @@
$xoops->redirect('index.php', 3, _US_NOEDITRIGHT);
exit();
}
- if ($xoopsConfigUser['avatar_allow_upload'] == 1 && $xoopsUser->getVar('posts') >= $xoopsConfigUser['avatar_minposts']) {
+ if ( $xoops->getModuleConfig('avatars_allowupload', 'avatars') == 1 && $xoops->user->getVar('posts') >= $xoops->getModuleConfig('avatars_postsrequired', 'avatars') ) {
$uploader = new XoopsMediaUploader( XOOPS_UPLOAD_PATH . '/avatars', array(
'image/gif' ,
'image/jpeg' ,
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/include/searchform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/include/searchform.php 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/include/searchform.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -57,5 +57,4 @@
}
$search_form->addElement(new XoopsFormHidden('action', 'results'));
$search_form->addElement(new XoopsFormHiddenToken('id'));
-$search_form->addElement(new XoopsFormButton('', 'submit', _SR_SEARCH, 'submit'));
-?>
\ No newline at end of file
+$search_form->addElement(new XoopsFormButton('', 'submit', _SR_SEARCH, 'submit'));
\ No newline at end of file
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 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -161,7 +161,7 @@
if (empty($uid) || $xoops->user->getVar('uid') != $uid) {
$xoops->redirect('index.php', 3, _US_NOEDITRIGHT);
}
- if ($xoops->getConfig('avatar_allow_upload') == 1 && $xoops->user->getVar('posts') >= $xoops->getConfig('avatar_minposts')) {
+ if ( $xoops->getModuleConfig('avatars_allowupload', 'avatars') == 1 && $xoops->user->getVar('posts') >= $xoops->getModuleConfig('avatars_postsrequired', 'avatars') ) {
$uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/avatars', array(
'image/gif', 'image/jpeg',
'image/pjpeg', 'image/x-png',
@@ -200,6 +200,8 @@
}
$xoops->redirect("edituser.php?op=avatarform", 3, $uploader->getErrors());
}
+ $xoops->redirect('index.php', 3, _US_NOEDITRIGHT);
+ exit();
}
if ($op == 'avatarchoose') {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/ProtectorFilter.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/ProtectorFilter.php 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/ProtectorFilter.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -63,7 +63,7 @@
$this->filters_base = dirname(dirname(__FILE__)).'/filters_enabled' ;
}
- function getInstance()
+ static function getInstance()
{
static $instance ;
if( ! isset( $instance ) ) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/protector.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/protector.php 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/protector/class/protector.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -1260,7 +1260,7 @@
function call_filter($type, $dying_message = '')
{
require_once dirname(__FILE__) . '/ProtectorFilter.php';
- $filter_handler =& ProtectorFilterHandler::getInstance();
+ $filter_handler = ProtectorFilterHandler::getInstance();
$ret = $filter_handler->execute($type);
if ($ret == false && $dying_message) {
die($dying_message);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/userrank/class/form/ranks.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -27,7 +27,7 @@
/**
* @param XoopsRank|XoopsObject $obj
*/
- public function __construct(XoopsRank &$obj)
+ public function __construct(XoopsObject &$obj)
{
if ($obj->isNew()) {
$blank_img = 'blank.gif';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-08-15 13:01:26 UTC (rev 10076)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/search.php 2012-08-15 13:04:17 UTC (rev 10077)
@@ -106,8 +106,9 @@
if ($action == 'search') {
$xoops->header();
include $xoops->path('include/searchform.php');
- $search_form->display();
+ $search_form->render(false);
$xoops->footer();
+ exit;
}
if ($andor != "OR" && $andor != "exact" && $andor != "AND") {
$andor = "AND";
@@ -149,7 +150,7 @@
unset($mids);
$mids = array_keys($modules);
}
- $xoops->header(_SR_SEARCHRESULTS . ': ' . implode(' ', $queries));
+ $xoops->header();
$nomatch = true;
echo "<h3>" . _SR_SEARCHRESULTS . "</h3>\n";
echo _SR_KEYWORDS . ':';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
