Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11716] XoopsCore/branches/2.6.x/2.6.0_alain091/ htdocs_psr
|
From: <al...@us...> - 2013-06-18 19:05:47
|
Revision: 11716
http://sourceforge.net/p/xoops/svn/11716
Author: alain91
Date: 2013-06-18 19:05:44 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Some fixes to unit tests bugs
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php
XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/recaptcha.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -45,12 +45,12 @@
require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php';
$form = "<script type=\"text/javascript\">
var RecaptchaOptions = {
- theme : '" . $this->config['theme'] . "',
- lang : '" . $this->config['lang'] . "'
+ theme : '" . (empty($this->config['theme']) ? '' : $this->config['theme']) . "',
+ lang : '" . (empty($this->config['lang']) ? '' : $this->config['lang']) . "'
};
</script>";
- $form .= recaptcha_get_html($this->config['public_key']);
-
+ $public_key = empty($this->config['public_key']) ? '' : $this->config['public_key'];
+ $form .= recaptcha_get_html($public_key);
return $form;
}
@@ -60,7 +60,7 @@
* @param $sessionName
* @return bool
*/
- public function verify($sessionName)
+ public function verify($sessionName = null)
{
$is_valid = false;
require_once dirname(__FILE__) . '/recaptcha/recaptchalib.php';
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/captcha/xoopscaptcha.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -494,9 +494,12 @@
*/
public function loadConfig($name = '')
{
- $this->config = empty($name) ? $this->handler->config
- : array_merge($this->handler->config, $this->handler->loadConfig($name));
-
+ if (!is_object($this->handler))
+ $this->config = array();
+ else
+ $this->config = empty($name)
+ ? $this->handler->config
+ : array_merge($this->handler->config, $this->handler->loadConfig($name));
}
/**
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/database/databasefactory.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -82,8 +82,7 @@
} else {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
}
- unset($database);
- $database = new $class();
+ $database = new $class();
} else {
trigger_error('notrace:Failed to load database of type: ' . XOOPS_DB_TYPE . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/module.textsanitizer.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -104,7 +104,7 @@
{
if (is_array($config_custom)) {
foreach ($config_custom as $key => $val) {
- if (is_array($config_default[$key])) {
+ if (array_key_exists($key,$config_default) AND is_array($config_default[$key])) {
$config_default[$key] = self::mergeConfig($config_default[$key], $config_custom[$key]);
} else {
$config_default[$key] = $val;
@@ -330,9 +330,11 @@
if (empty($text) || empty($instance->config['truncate_length']) || strlen($text) < $instance->config['truncate_length']) {
return $text;
}
- $len = floor($instance->config['truncate_length'] / 2);
- $ret = substr($text, 0, $len) . ' ... ' . substr($text, 5 - $len);
-
+ $len = (((strlen($text) - $instance->config['truncate_length']) - 5) / 2);
+ if ($len < 5)
+ $ret = substr($text, 0, $len) . ' ... ' . substr($text, -$len);
+ else
+ $ret = substr($text,0,$instance->config['truncate_length']);
return $ret;
}
@@ -352,7 +354,7 @@
$replacements[] = '<a href="' . XOOPS_URL . '/\\2" title="">\\3</a>';
$patterns[] = "/\[url=(['\"]?)(http[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
$replacements[] = '<a href="\\2" rel="external" title="">\\3</a>';
- $patterns[] = "/\[url=(['\"]?)(ftp?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
+ $patterns[] = "/\[url=(['\"]?)(ftp[s]?:\/\/[^\"'<>]*)\\1](.*)\[\/url\]/sU";
$replacements[] = '<a href="\\2" rel="external" title="">\\3</a>';
$patterns[] = "/\[url=(['\"]?)([^'\"<>]*)\\1](.*)\[\/url\]/sU";
$replacements[] = '<a href="http://\\2" rel="external" title="">\\3</a>';
@@ -661,7 +663,7 @@
return false;
}
$class = 'Myts' . ucfirst($name);
- if (!class_exists($class)) {
+ if (!class_exists($class,false)) {
trigger_error("Extension '{$name}' does not exist", E_USER_WARNING);
return false;
@@ -681,6 +683,7 @@
public function executeExtension($name)
{
$extension = $this->loadExtension($name);
+ if (!$extension) return false;
$args = array_slice(func_get_args(), 1);
return call_user_func_array(array($extension , 'load'), array_merge(array(&$this), $args));
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/class/utility/xoopsutility.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -35,10 +35,8 @@
public static function recursive($handler, $data)
{
if (is_array($data)) {
- $return = array_map(array(
- 'XoopsUtility' ,
- 'recursive'), $handler, $data);
-
+ $return = array_map(array('XoopsUtility', 'recursive'),
+ array_fill(0, count($data), $handler), $data);
return $return;
}
// single function
@@ -46,10 +44,8 @@
return function_exists($handler) ? $handler($data) : $data;
}
// Method of a class
- if (is_array($handler)) {
- return call_user_func(array(
- $handler[0] ,
- $handler[1]), $data);
+ if (is_callable($handler)) {
+ return call_user_func($handler, $data);
}
return $data;
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/block.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -290,27 +290,23 @@
// T : use text sanitizater (smilies disabled)
if ($c_type == 'H') {
return str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
- } else {
- if ($c_type == 'P') {
- ob_start();
- echo eval($this->getVar('content', 'n'));
- $content = ob_get_contents();
- ob_end_clean();
+ } elseif ($c_type == 'P') {
+ ob_start();
+ echo eval($this->getVar('content', 'n'));
+ $content = ob_get_contents();
+ ob_end_clean();
- return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
- } else {
- if ($c_type == 'S') {
- $myts = MyTextSanitizer::getInstance();
- $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+ return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content);
+ } elseif ($c_type == 'S') {
+ $myts = MyTextSanitizer::getInstance();
+ $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
- return $myts->displayTarea($content, 1, 1);
- } else {
- $myts = MyTextSanitizer::getInstance();
- $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
+ return $myts->displayTarea($content, 1, 1);
+ } else {
+ $myts = MyTextSanitizer::getInstance();
+ $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n'));
- return $myts->displayTarea($content, 1, 0);
- }
- }
+ return $myts->displayTarea($content, 1, 0);
}
break;
case 'e':
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/kernel/session.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -138,14 +138,13 @@
{
$sess_id = $this->db->quoteString($sess_id);
$sql = sprintf('UPDATE %s SET sess_updated = %u, sess_data = %s WHERE sess_id = %s', $this->db->prefix('session'), time(), $this->db->quoteString($sess_data), $sess_id);
- $this->db->queryF($sql);
- if (!$this->db->getAffectedRows()) {
+ $result = $this->db->queryF($sql);
+ if ($this->db->getAffectedRows() <= 0) {
$sql = sprintf('INSERT INTO %s (sess_id, sess_updated, sess_ip, sess_data) VALUES (%s, %u, %s, %s)', $this->db->prefix('session'), $sess_id, time(), $this->db->quoteString($_SERVER['REMOTE_ADDR']), $this->db->quoteString($sess_data));
-
- return $this->db->queryF($sql);
+ $result = $this->db->queryF($sql);
}
- return true;
+ return (false !== $result);
}
/**
@@ -265,6 +264,6 @@
$session_name = ($xoops->getConfig('use_mysession') && $xoops->getConfig('session_name') != '') ? $xoops->getConfig('session_name') : session_name();
$session_expire = !is_null($expire) ? intval($expire) : (($xoops->getConfig('use_mysession') && $xoops->getConfig('session_name') != '') ? $xoops->getConfig('session_expire') * 60 : ini_get("session.cookie_lifetime"));
$session_id = empty($sess_id) ? session_id() : $sess_id;
- setcookie($session_name, $session_id, $session_expire ? time() + $session_expire : 0, '/', XOOPS_COOKIE_DOMAIN, 0);
+ if (!headers_sent()) setcookie($session_name, $session_id, $session_expire ? time() + $session_expire : 0, '/', XOOPS_COOKIE_DOMAIN, 0);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php 2013-06-18 19:04:33 UTC (rev 11715)
+++ XoopsCore/branches/2.6.x/2.6.0_alain091/htdocs_psr/modules/publisher/xoops_version.php 2013-06-18 19:05:44 UTC (rev 11716)
@@ -21,8 +21,7 @@
defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-$xoops = Xoops::getInstance();
-XoopsLoad::loadFile($xoops->path(dirname(__FILE__) . '/include/constants.php'));
+XoopsLoad::loadFile(dirname(__FILE__) . '/include/constants.php');
$modversion['name'] = _MI_PUBLISHER_MD_NAME;
$modversion['description'] = _MI_PUBLISHER_MD_DESC;
|
