mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00
Code Issues Releases Wiki Activity

CHARSET deprecated

Browse Source
This commit is contained in:
marj
2009-07-19 11:44:30 +00:00
parent 7a62bec60d
commit 5e462df2c7
22 changed files with 109 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_files/bbcode/code.bb
View File

@@ -25,7 +25,7 @@ if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/
$geshi = new GeSHi($code_text, ($pref['defaultLanGeshi'] ? $pref['defaultLanGeshi'] : 'php'), e_PLUGIN."geshi/geshi/");
}
$geshi->line_style1 = "font-family: 'Courier New', Courier, monospace; font-weight: normal; font-style: normal;";
$geshi->set_encoding(CHARSET);
$geshi->set_encoding('utf-8');
$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
$geshi->set_header_type(GESHI_HEADER_DIV);
$CodeCache = $geshi->parse_code();
@@ -35,7 +35,7 @@ if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/
}
else
{
$code_text = html_entity_decode($code_text, ENT_QUOTES, CHARSET);
$code_text = html_entity_decode($code_text, ENT_QUOTES, 'utf-8');
$highlighted_text = highlight_string($code_text, TRUE);
$divClass = ($parm) ? $parm : 'code_highlight';
$ret = "<div class='".$tp -> toAttribute($divClass)." code-box' style='unicode-bidi: embed; direction: ltr'>{$highlighted_text}</div>";

6
e107_files/shortcode/batch/admin_shortcodes_class.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: admin_shortcodes_class.php,v 1.13 2009-07-18 11:51:44 marj_nl_fr Exp $
* $Id: admin_shortcodes_class.php,v 1.14 2009-07-19 11:44:28 marj_nl_fr Exp $
*
* Admin shortcode batch - class
*/
@@ -792,7 +792,7 @@ class admin_shortcodes
".FOOTLAN_16.": ".$mySQLdefaultdb."
<br /><br />
<b>".FOOTLAN_17."</b>
<br />".CHARSET;
<br />utf-8"; //@TODO is this still needed?
return $ns->tablerender(FOOTLAN_13, $text, '', TRUE);
}
}
@@ -921,7 +921,7 @@ class admin_shortcodes
{
/*
* e107 website system (c) 2001-2008 Steve Dunstan (e107.org)
* $Id: admin_shortcodes_class.php,v 1.13 2009-07-18 11:51:44 marj_nl_fr Exp $
* $Id: admin_shortcodes_class.php,v 1.14 2009-07-19 11:44:28 marj_nl_fr Exp $
*/
if (ADMIN)

12
e107_files/utilities/resetcore.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_files/utilities/resetcore.php,v $
| $Revision: 1.1 $
| $Date: 2008-10-14 20:24:29 $
| $Author: e107steved $
| $Revision: 1.2 $
| $Date: 2009-07-19 11:44:28 $
| $Author: marj_nl_fr $
+----------------------------------------------------------------------------+
*/
@@ -28,12 +28,9 @@ If you don't, the script will not be usable.
When you have finished with resetcore you should swap true for false so it can't be used by
people it shouldn't be used by.
If your site uses a different charset than utf-8, change the CHARSET to reflect the correct encoding.
*/
define("ACTIVE", false);
define("CHARSET", 'utf-8');
/* #################################################### */
@@ -64,14 +61,13 @@ define("e107_INIT", TRUE);
require_once('../../'.$HANDLERS_DIRECTORY.'arraystorage_class.php');
$eArrayStorage = new ArrayData();
echo "<?xml version='1.0' encoding='".CHARSET."' ?>\n";
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><e107 resetcore></title>
<link rel="stylesheet" href="style.css" />
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="content-style-type" content="text/css" />
</head>
<body>