mirror of
https://github.com/torrentpier/torrentpier
synced 2025-08-19 21:03:54 -07:00
UFT-8 autocorrection removal from standart package.
This commit is contained in:
Yuriy Pikhtarev
parent
091878c088
commit
02bb08dcd2
6 changed files with 2 additions and 7946 deletions
|
|
@ -506,7 +506,6 @@ $bb_cfg['search_min_word_len'] = 3;
|
||||||
$bb_cfg['search_max_word_len'] = 35;
|
$bb_cfg['search_max_word_len'] = 35;
|
||||||
$bb_cfg['limit_max_search_results'] = false;
|
$bb_cfg['limit_max_search_results'] = false;
|
||||||
$bb_cfg['spam_filter_file_path'] = ''; // BB_PATH .'/misc/spam_filter_words.txt';
|
$bb_cfg['spam_filter_file_path'] = ''; // BB_PATH .'/misc/spam_filter_words.txt';
|
||||||
$bb_cfg['autocorrect_wkl'] = true; // autocorrect wrong keyboard layout
|
|
||||||
|
|
||||||
// Posting
|
// Posting
|
||||||
$bb_cfg['prevent_multiposting'] = true; // replace "reply" with "edit last msg" if user (not admin or mod) is last topic poster
|
$bb_cfg['prevent_multiposting'] = true; // replace "reply" with "edit last msg" if user (not admin or mod) is last topic poster
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,225 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* MIT License
|
|
||||||
*
|
|
||||||
* Copyright (c) 2005-2017 TorrentPier
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
|
||||||
* in the Software without restriction, including without limitation the rights
|
|
||||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
* copies of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be included in all
|
|
||||||
* copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!defined('BB_ROOT')) {
|
|
||||||
die(basename(__FILE__));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A class for validating method parameters to allowed types via reflection.
|
|
||||||
*
|
|
||||||
* Purpose
|
|
||||||
* Used as a more convenient multiple assert(), standing after the declaration of the methods.
|
|
||||||
*
|
|
||||||
* Features and advantage
|
|
||||||
* * Very easy to use
|
|
||||||
* * Ability to turn off on the production server
|
|
||||||
*
|
|
||||||
* WARNING
|
|
||||||
* On a production server, it is important to disable assert, that would save server resources.
|
|
||||||
* For this, use the assert_options(ASSERT_ACTIVE, false) or INI setting "assert.active 0".
|
|
||||||
* In this case ReflectionTypeHint::isValid() always returns TRUE!
|
|
||||||
*
|
|
||||||
* Useful links
|
|
||||||
* http://www.ilia.ws/archives/205-Type-hinting-for-PHP-5.3.html
|
|
||||||
* http://php.net/manual/en/language.oop5.typehinting.php
|
|
||||||
*
|
|
||||||
* @example ReflectionTypeHint_example.php
|
|
||||||
* @link http://code.google.com/p/php5-reflection-type-hint/
|
|
||||||
* @license http://creativecommons.org/licenses/by-sa/3.0/
|
|
||||||
* @author Nasibullin Rinat
|
|
||||||
* @version 1.1.0
|
|
||||||
*/
|
|
||||||
class ReflectionTypeHint
|
|
||||||
{
|
|
||||||
protected static $hints = array(
|
|
||||||
'int' => 'is_int',
|
|
||||||
'integer' => 'is_int',
|
|
||||||
'digit' => 'ctype_digit',
|
|
||||||
'number' => 'ctype_digit',
|
|
||||||
'float' => 'is_float',
|
|
||||||
'double' => 'is_float',
|
|
||||||
'real' => 'is_float',
|
|
||||||
'numeric' => 'is_numeric',
|
|
||||||
'str' => 'is_string',
|
|
||||||
'string' => 'is_string',
|
|
||||||
'char' => 'is_string',
|
|
||||||
'bool' => 'is_bool',
|
|
||||||
'boolean' => 'is_bool',
|
|
||||||
'null' => 'is_null',
|
|
||||||
'array' => 'is_array',
|
|
||||||
'obj' => 'is_object',
|
|
||||||
'object' => 'is_object',
|
|
||||||
'res' => 'is_resource',
|
|
||||||
'resource' => 'is_resource',
|
|
||||||
'scalar' => 'is_scalar', #integer, float, string or boolean
|
|
||||||
'cb' => 'is_callable',
|
|
||||||
'callback' => 'is_callable',
|
|
||||||
);
|
|
||||||
|
|
||||||
#calling the methods of this class only statically!
|
|
||||||
private function __construct()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function isValid()
|
|
||||||
{
|
|
||||||
if (!assert_options(ASSERT_ACTIVE)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
$bt = self::debugBacktrace(null, 1);
|
|
||||||
extract($bt); //to $file, $line, $function, $class, $object, $type, $args
|
|
||||||
if (!$args) {
|
|
||||||
return true;
|
|
||||||
} #speed improve
|
|
||||||
$r = new ReflectionMethod($class, $function);
|
|
||||||
$doc = $r->getDocComment();
|
|
||||||
$cache_id = $class . $type . $function;
|
|
||||||
preg_match_all('~ [\r\n]++ [\x20\t]++ \* [\x20\t]++
|
|
||||||
@param
|
|
||||||
[\x20\t]++
|
|
||||||
\K #memory reduce
|
|
||||||
( [_a-z]++[_a-z\d]*+
|
|
||||||
(?>[|/,][_a-z]+[_a-z\d]*)*+
|
|
||||||
) #1 types
|
|
||||||
[\x20\t]++
|
|
||||||
&?+\$([_a-z]++[_a-z\d]*+) #2 name
|
|
||||||
~sixSX', $doc, $params, PREG_SET_ORDER);
|
|
||||||
$parameters = $r->getParameters();
|
|
||||||
//d($args, $params, $parameters);
|
|
||||||
if (count($parameters) > count($params)) {
|
|
||||||
$message = 'phpDoc %d piece(s) @param description expected in %s%s%s(), %s given, ' . PHP_EOL
|
|
||||||
. 'called in %s on line %d ' . PHP_EOL
|
|
||||||
. 'and defined in %s on line %d';
|
|
||||||
$message = sprintf($message, count($parameters), $class, $type, $function, count($params), $file, $line, $r->getFileName(), $r->getStartLine());
|
|
||||||
trigger_error($message, E_USER_NOTICE);
|
|
||||||
}
|
|
||||||
foreach ($args as $i => $value) {
|
|
||||||
if (!isset($params[$i])) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if ($parameters[$i]->name !== $params[$i][2]) {
|
|
||||||
$param_num = $i + 1;
|
|
||||||
$message = 'phpDoc @param %d in %s%s%s() must be named as $%s, $%s given, ' . PHP_EOL
|
|
||||||
. 'called in %s on line %d ' . PHP_EOL
|
|
||||||
. 'and defined in %s on line %d';
|
|
||||||
$message = sprintf($message, $param_num, $class, $type, $function, $parameters[$i]->name, $params[$i][2], $file, $line, $r->getFileName(), $r->getStartLine());
|
|
||||||
trigger_error($message, E_USER_NOTICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
$hints = preg_split('~[|/,]~sSX', $params[$i][1]);
|
|
||||||
if (!self::checkValueTypes($hints, $value)) {
|
|
||||||
$param_num = $i + 1;
|
|
||||||
$message = 'Argument %d passed to %s%s%s() must be an %s, %s given, ' . PHP_EOL
|
|
||||||
. 'called in %s on line %d ' . PHP_EOL
|
|
||||||
. 'and defined in %s on line %d';
|
|
||||||
$message = sprintf($message, $param_num, $class, $type, $function, implode('|', $hints), (is_object($value) ? get_class($value) . ' ' : '') . gettype($value), $file, $line, $r->getFileName(), $r->getStartLine());
|
|
||||||
trigger_error($message, E_USER_WARNING);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return stacktrace. Correctly work with call_user_func*()
|
|
||||||
* (totally skip them correcting caller references).
|
|
||||||
* If $return_frame is present, return only $return_frame matched caller, not all stacktrace.
|
|
||||||
*
|
|
||||||
* @param string|null $re_ignore example: '~^' . preg_quote(__CLASS__, '~') . '(?![a-zA-Z\d])~sSX'
|
|
||||||
* @param int|null $return_frame
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public static function debugBacktrace($re_ignore = null, $return_frame = null)
|
|
||||||
{
|
|
||||||
$trace = debug_backtrace();
|
|
||||||
|
|
||||||
$a = array();
|
|
||||||
$frames = 0;
|
|
||||||
for ($i = 0, $n = count($trace); $i < $n; $i++) {
|
|
||||||
$t = $trace[$i];
|
|
||||||
if (!$t) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Next frame.
|
|
||||||
$next = isset($trace[$i + 1]) ? $trace[$i + 1] : null;
|
|
||||||
|
|
||||||
// Dummy frame before call_user_func*() frames.
|
|
||||||
if (!isset($t['file']) && $next) {
|
|
||||||
$t['over_function'] = $trace[$i + 1]['function'];
|
|
||||||
$t += $trace[$i + 1];
|
|
||||||
$trace[$i + 1] = null; // skip call_user_func on next iteration
|
|
||||||
}
|
|
||||||
|
|
||||||
// Skip myself frame.
|
|
||||||
if (++$frames < 2) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 'class' and 'function' field of next frame define where this frame function situated.
|
|
||||||
// Skip frames for functions situated in ignored places.
|
|
||||||
if ($re_ignore && $next) {
|
|
||||||
// Name of function "inside which" frame was generated.
|
|
||||||
$frame_caller = (isset($next['class']) ? $next['class'] . $next['type'] : '')
|
|
||||||
. (isset($next['function']) ? $next['function'] : '');
|
|
||||||
if (preg_match($re_ignore, $frame_caller)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// On each iteration we consider ability to add PREVIOUS frame to $a stack.
|
|
||||||
if (count($a) === $return_frame) {
|
|
||||||
return $t;
|
|
||||||
}
|
|
||||||
$a[] = $t;
|
|
||||||
}
|
|
||||||
return $a;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks a value to the allowed types
|
|
||||||
*
|
|
||||||
* @param array $types
|
|
||||||
* @param mixed $value
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public static function checkValueTypes(array $types, $value)
|
|
||||||
{
|
|
||||||
foreach ($types as $type) {
|
|
||||||
$type = strtolower($type);
|
|
||||||
if (array_key_exists($type, self::$hints) && call_user_func(self::$hints[$type], $value)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (is_object($value) && @is_a($value, $type)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if ($type === 'mixed') {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load diff
11
search.php
11
search.php
|
|
@ -28,9 +28,6 @@ define('BB_ROOT', './');
|
||||||
require __DIR__ . '/common.php';
|
require __DIR__ . '/common.php';
|
||||||
|
|
||||||
require INC_DIR . '/bbcode.php';
|
require INC_DIR . '/bbcode.php';
|
||||||
require CLASS_DIR . '/utf8.php';
|
|
||||||
require CLASS_DIR . '/correct.php';
|
|
||||||
require CLASS_DIR . '/reflection.php';
|
|
||||||
|
|
||||||
$page_cfg['load_tpl_vars'] = array(
|
$page_cfg['load_tpl_vars'] = array(
|
||||||
'post_buttons',
|
'post_buttons',
|
||||||
|
|
@ -417,13 +414,7 @@ if (!$items_found) {
|
||||||
// Search words
|
// Search words
|
||||||
if ($var =& $_REQUEST[$text_match_key]) {
|
if ($var =& $_REQUEST[$text_match_key]) {
|
||||||
if ($tmp = mb_substr(trim($var), 0, $text_match_max_len)) {
|
if ($tmp = mb_substr(trim($var), 0, $text_match_max_len)) {
|
||||||
if ($bb_cfg['autocorrect_wkl']) {
|
$title_match_val = $tmp;
|
||||||
// Autocorrect wrong keyboard layout
|
|
||||||
$tlc = new Text_LangCorrect();
|
|
||||||
$title_match_val = $tlc->parse($tlc->parse($tmp, 1), 2);
|
|
||||||
} else {
|
|
||||||
$title_match_val = $tmp;
|
|
||||||
}
|
|
||||||
$text_match_sql = clean_text_match($title_match_val, $all_words_val, true);
|
$text_match_sql = clean_text_match($title_match_val, $all_words_val, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
11
tracker.php
11
tracker.php
|
|
@ -27,9 +27,6 @@ define('BB_SCRIPT', 'tracker');
|
||||||
define('BB_ROOT', './');
|
define('BB_ROOT', './');
|
||||||
require __DIR__ . '/common.php';
|
require __DIR__ . '/common.php';
|
||||||
|
|
||||||
require CLASS_DIR . '/utf8.php';
|
|
||||||
require CLASS_DIR . '/correct.php';
|
|
||||||
require CLASS_DIR . '/reflection.php';
|
|
||||||
require INC_DIR . '/functions_group.php';
|
require INC_DIR . '/functions_group.php';
|
||||||
|
|
||||||
// Page config
|
// Page config
|
||||||
|
|
@ -437,13 +434,7 @@ if (!$set_default) {
|
||||||
|
|
||||||
if ($tm =& $_REQUEST[$title_match_key] and is_string($tm)) {
|
if ($tm =& $_REQUEST[$title_match_key] and is_string($tm)) {
|
||||||
if ($tmp = mb_substr(trim($tm), 0, $title_match_max_len)) {
|
if ($tmp = mb_substr(trim($tm), 0, $title_match_max_len)) {
|
||||||
if ($bb_cfg['autocorrect_wkl']) {
|
$title_match_val = $tmp;
|
||||||
// Autocorrect wrong keyboard layout
|
|
||||||
$tlc = new Text_LangCorrect();
|
|
||||||
$title_match_val = $tlc->parse($tlc->parse($tmp, 1), 2);
|
|
||||||
} else {
|
|
||||||
$title_match_val = $tmp;
|
|
||||||
}
|
|
||||||
$title_match_sql = clean_text_match($title_match_val, true, false);
|
$title_match_sql = clean_text_match($title_match_val, true, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue