Minahito
minah****@users*****
2006年 1月 2日 (月) 21:40:26 JST
Index: xoops2jp/html/kernel/module.php
diff -u xoops2jp/html/kernel/module.php:1.2.8.4 xoops2jp/html/kernel/module.php:1.2.8.5
--- xoops2jp/html/kernel/module.php:1.2.8.4 Tue Dec 27 19:35:02 2005
+++ xoops2jp/html/kernel/module.php Mon Jan 2 21:40:26 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: module.php,v 1.2.8.4 2005/12/27 10:35:02 minahito Exp $
+// $Id: module.php,v 1.2.8.5 2006/01/02 12:40:26 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -113,6 +113,8 @@
**/
function &getInfo($name=null)
{
+ $ret = false;
+
if ( !isset($this->modinfo) ) {
$this->loadInfo($this->getVar('dirname'));
}
@@ -120,7 +122,7 @@
if ( isset($this->modinfo[$name]) ) {
return $this->modinfo[$name];
}
- return false;
+ return $ret;
}
return $this->modinfo;
}
Index: xoops2jp/html/kernel/configitem.php
diff -u xoops2jp/html/kernel/configitem.php:1.2 xoops2jp/html/kernel/configitem.php:1.2.8.1
--- xoops2jp/html/kernel/configitem.php:1.2 Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/kernel/configitem.php Mon Jan 2 21:40:26 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: configitem.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: configitem.php,v 1.2.8.1 2006/01/02 12:40:26 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -92,22 +92,25 @@
*/
function &getConfValueForOutput()
{
+ $ret = null;
switch ($this->getVar('conf_valuetype')) {
case 'int':
- return intval($this->getVar('conf_value', 'N'));
+ $ret = intval($this->getVar('conf_value', 'N'));
break;
case 'array':
- return unserialize($this->getVar('conf_value', 'N'));
+ $ret = unserialize($this->getVar('conf_value', 'N'));
case 'float':
$value = $this->getVar('conf_value', 'N');
- return (float)$value;
+ $ret = floatval($value);
break;
case 'textarea':
- return $this->getVar('conf_value');
+ $ret = $this->getVar('conf_value');
default:
- return $this->getVar('conf_value', 'N');
+ $ret = $this->getVar('conf_value', 'N');
break;
}
+
+ return $ret;
}
/**
Index: xoops2jp/html/kernel/config.php
diff -u xoops2jp/html/kernel/config.php:1.2 xoops2jp/html/kernel/config.php:1.2.8.1
--- xoops2jp/html/kernel/config.php:1.2 Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/kernel/config.php Mon Jan 2 21:40:26 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: config.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: config.php,v 1.2.8.1 2006/01/02 12:40:26 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -185,7 +185,8 @@
*/
function &getConfigs($criteria = null, $id_as_key = false, $with_options = false)
{
- return $this->_cHandler->getObjects($criteria, $id_as_key);
+ $config =& $this->_cHandler->getObjects($criteria, $id_as_key);
+ return $config;
}
/**
Index: xoops2jp/html/kernel/object.php
diff -u xoops2jp/html/kernel/object.php:1.2.8.2 xoops2jp/html/kernel/object.php:1.2.8.3
--- xoops2jp/html/kernel/object.php:1.2.8.2 Wed Nov 2 20:17:19 2005
+++ xoops2jp/html/kernel/object.php Mon Jan 2 21:40:26 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: object.php,v 1.2.8.2 2005/11/02 11:17:19 minahito Exp $
+// $Id: object.php,v 1.2.8.3 2006/01/02 12:40:26 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -286,14 +286,14 @@
case 'e':
case 'edit':
$ts =& MyTextSanitizer::getInstance();
- return $ts->htmlSpecialChars($ret);
+ $ret = $ts->htmlSpecialChars($ret);
break 1;
case 'p':
case 'preview':
case 'f':
case 'formpreview':
$ts =& MyTextSanitizer::getInstance();
- return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
+ $ret = $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
break 1;
case 'n':
case 'none':
@@ -311,11 +311,11 @@
$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
- return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
+ $ret = $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
break 1;
case 'e':
case 'edit':
- return htmlspecialchars($ret, ENT_QUOTES);
+ $ret = htmlspecialchars($ret, ENT_QUOTES);
break 1;
case 'p':
case 'preview':
@@ -325,12 +325,12 @@
$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
- return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
+ $ret = $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
break 1;
case 'f':
case 'formpreview':
$ts =& MyTextSanitizer::getInstance();
- return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+ $ret = htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
break 1;
case 'n':
case 'none':
@@ -348,17 +348,17 @@
break 1;
case 'e':
case 'edit':
- return htmlspecialchars($ret, ENT_QUOTES);
+ $ret = htmlspecialchars($ret, ENT_QUOTES);
break 1;
case 'p':
case 'preview':
$ts =& MyTextSanitizer::getInstance();
- return $ts->stripSlashesGPC($ret);
+ $ret = $ts->stripSlashesGPC($ret);
break 1;
case 'f':
case 'formpreview':
$ts =& MyTextSanitizer::getInstance();
- return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+ $ret = htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
break 1;
case 'n':
case 'none':
@@ -381,7 +381,7 @@
}
$i++;
}
- return implode(', ', $ret);
+ $ret = implode(', ', $ret);
case 'e':
case 'edit':
$ret = explode('|', $ret);