mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

spelling fixes

Browse Source
This commit is contained in:
klemens 2017-04-06 22:26:07 +02:00
parent 4d8f04d406
commit 5a95db314a
38 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htmlarea/ckeditor_s9y_config.js
View File

@ -154,7 +154,7 @@ CKEDITOR.editorConfig = function( config ) {
/** SECTION: Certain Plugin Buttons
We cheat ckeditor instances by adding all available button names (in s9ypluginbuttons) to "both" toolbar instances, in case of having two textareas.
The instanciation will only take the ones being currently initiated in wysiwyg_init.tpl output, in the source code.
The instantiation will only take the ones being currently initiated in wysiwyg_init.tpl output, in the source code.
The hooked and added extraPlugins in wysiwyg_init become not automatically true for preset toolbars (Basic, Standard, Full) like this, but do for the fallback toolbarGroups later on.
*/
// concat button arrays

4
htmlarea/ckeditor_s9y_plugin.js
View File

@ -12,7 +12,7 @@
var s9ymediabuttons = [];
// Init CKEDITOR added plugins
// Seperate by comma, no whitespace allowed, and keep last comma, since later on concatenated with Serendipity hooked plugins, eg MediaLibrary!
// Separate by comma, no whitespace allowed, and keep last comma, since later on concatenated with Serendipity hooked plugins, eg MediaLibrary!
// For some CKEDITOR plugin you need the widget plugin, which is added here.
// Plugin Dependencies: widget Add-on Dependencies: Line Utilities and Clipboard
// mediaembed is a fast and simple YouTube code CKEditor-Plugin: v. 0.5+ (https://github.com/frozeman/MediaEmbed, 2013-09-12) to avoid ACF restrictions
@ -66,7 +66,7 @@
element.attributes.style = element.attributes.style.replace( /(?:^|\s)height\s*:\s*(\d+)px;?/i , '' );
//element.attributes.height = height;
// Do not add to element attribute height, since then the height will be automatically (re-) added to style again by ckeditor or image js
// The current result is now: img alt class src style{width}. That is the only working state to get arround this issue in a relative simple way!
// The current result is now: img alt class src style{width}. That is the only working state to get around this issue in a relative simple way!
// Remember: Turning ACF OFF, will leave code alone, but still removes the height="" attribute! (workaround in extraAllowedContent added img[height]!)
}
}

2
include/admin/entries.inc.php
View File

@ -159,7 +159,7 @@ switch($serendipity['GET']['adminAction']) {
}
// serendipity_updertEntry sets this global variable to store the entry id. Couldn't pass this
// by reference or as return value because it affects too many places inside our API and dependant
// by reference or as return value because it affects too many places inside our API and dependent
// function calls.
if (!empty($serendipity['lastSavedEntry'])) {
$entry['id'] = $serendipity['lastSavedEntry'];

4
include/admin/import.inc.php
View File

@ -162,8 +162,8 @@ class Serendipity_Import {
*
* @access public
* @param string SQL Query
* @param ressource DB connection resource
* @return ressource SQL response
* @param resource DB connection resource
* @return resource SQL response
*/
function &nativeQuery($query, $db = false) {
global $serendipity;

4
include/admin/importers/blogger.inc.php
View File

@ -67,7 +67,7 @@ class Serendipity_Import_Blogger extends Serendipity_Import {
// Request token
$response = $req->send();
// Handle token reponse
// Handle token response
if ($response->getStatus() != '200') return;
// Extract Auth token
@ -153,7 +153,7 @@ class Serendipity_Import_Blogger extends Serendipity_Import {
// Handle errors
if ($response->getStatus() != '200') {
echo "Error occured while trying to export the blog.";
echo "Error occurred while trying to export the blog.";
return false;
}

6
include/admin/installer.inc.php
View File

@ -33,7 +33,7 @@ $data['templatePath'] = $serendipity['templatePath'];
$data['installerHTTPPath'] = str_replace('//', '/', dirname($_SERVER['PHP_SELF']) . '/'); // since different OS handlers for enddir
/**
* Checks a return code constant if it's successfull or an error and return HTML code
* Checks a return code constant if it's successful or an error and return HTML code
*
* The diagnosis checks return codes of several PHP checks. Depending
* on the input, a specially formatted string is returned.
@ -46,7 +46,7 @@ $data['installerHTTPPath'] = str_replace('//', '/', dirname($_SERVER['PHP_SELF']
function serendipity_installerResultDiagnose($result, $s) {
global $errorCount, $data;
if ( $result === S9Y_I_SUCCESS ) {
$data['i_success'] = true; // we dont need data here explicitely, but we keep it for possible future purposes
$data['i_success'] = true; // we don't need data here explicitly, but we keep it for possible future purposes
return '<span class="msg_success">'. $s .'</span>';
}
if ( $result === S9Y_I_WARNING ) {
@ -69,7 +69,7 @@ if (!empty($serendipity['POST']['getstep']) && is_numeric($serendipity['POST']['
/* From configuration to install */
if ( sizeof($_POST) > 1 && $serendipity['GET']['step'] == '3' ) {
/* One problem, if the user chose to do an easy install, not all config vars has been transfered
/* One problem, if the user chose to do an easy install, not all config vars has been transferred
Therefore we fetch all config vars with their default values, and merge them with our POST data */
$config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);

2
include/admin/personal.inc.php
View File

@ -46,7 +46,7 @@ if ($serendipity['GET']['adminAction'] == 'save' && serendipity_checkFormToken()
if (in_array('groups', $item['flags'])) {
if (serendipity_checkPermission('adminUsersMaintainOthers')) {
// Void, no fixing neccessarry
// Void, no fixing necessarry
} elseif (serendipity_checkPermission('adminUsersMaintainSame')) {
if (!is_array($_POST[$item['var']])) {

2
include/admin/plugins.inc.php
View File

@ -38,7 +38,7 @@ if (isset($_GET['serendipity']['plugin_to_move']) && isset($_GET['submit']) && s
}
/* If idx_to_move is still -1 then we never found it (shouldn't happen under normal conditions)
Also make sure the swaping idx is around */
Also make sure the swapping idx is around */
if ($idx_to_move >= 0 && (($_GET['submit'] == 'move down' && $idx_to_move < (count($plugins)-1)) || ($_GET['submit'] == 'move up' && $idx_to_move > 0))) {
/* Swap the one were moving with the one that's in the spot we're moving to */

2
include/admin/templates.inc.php
View File

@ -104,7 +104,7 @@ $data["cur_template"] = $serendipity['template'];
$data["cur_template_backend"] = $serendipity['template_backend'];
$data['cur_template_info'] = serendipity_fetchTemplateInfo($serendipity['template']);
// NOTE: config.inc.php currently only applies to frontend configuration. Backend configuration is not planned yet, and would preferrably use a "config_backend.inc.php" file!
// NOTE: config.inc.php currently only applies to frontend configuration. Backend configuration is not planned yet, and would preferably use a "config_backend.inc.php" file!
if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . $data['cur_template_info']['custom_config_engine'] . '/config.inc.php')) {
serendipity_smarty_init();
$old_template_config_groups = $template_config_groups;

4
include/admin/upgrader.inc.php
View File

@ -12,7 +12,7 @@ define('S9Y_U_WARNING', 0);
define('S9Y_U_SUCCESS', 1);
/**
* Checks a return code constant if it's successfull or an error and return HTML code
* Checks a return code constant if it's successful or an error and return HTML code
*
* The diagnosis checks return codes of several PHP checks. Depending
* on the input, a specially formatted string is returned.
@ -26,7 +26,7 @@ function serendipity_upgraderResultDiagnose($result, $s) {
global $errorCount, $data;
if ( $result === S9Y_U_SUCCESS ) {
$data['u_success'] = true; // we dont need data here explicitely, but we keep it for possible future purposes
$data['u_success'] = true; // we don't need data here explicitly, but we keep it for possible future purposes
return '<span class="msg_success">'. $s .'</span>';
}

4
include/admin/users.inc.php
View File

@ -51,7 +51,7 @@ if (isset($_POST['SAVE_NEW']) && serendipity_checkFormToken()) {
if (in_array('groups', $item['flags'])) {
if (serendipity_checkPermission('adminUsersMaintainOthers')) {
// Void, no fixing neccessarry
// Void, no fixing necessarry
} elseif (serendipity_checkPermission('adminUsersMaintainSame')) {
// Check that no user may assign groups he's not allowed to.
@ -115,7 +115,7 @@ if (isset($_POST['SAVE_EDIT']) && serendipity_checkFormToken()) {
if (in_array('groups', $item['flags'])) {
if (serendipity_checkPermission('adminUsersMaintainOthers')) {
// Void, no fixing neccessarry
// Void, no fixing necessarry
} elseif (serendipity_checkPermission('adminUsersMaintainSame')) {

2
include/compat.inc.php
View File

@ -110,7 +110,7 @@ function debug_ErrorLevelType($type)
/**
* Set our own exeption handler to convert all errors into exeptions automatically
* Set our own exception handler to convert all errors into exceptions automatically
* function_exists() avoids 'cannot redeclare previously declared' fatal errors in XML feed context.
*
* See Notes about returning false

8
include/db/generic.inc.php
View File

@ -98,7 +98,7 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
/**
* Perform a sql-query with the now possible ? syntax for parameters
* @param string SQL query to exectue, for example "SELECT * from X where Y = ?
* @param array Paramters to insert into the sql-query
* @param array Parameters to insert into the sql-query
* @result mixed Returns the result of the SQL query, depending on the input parameters
*/
function serendipity_db_query2($sql, $parameters = array()) {
@ -172,7 +172,7 @@ function serendipity_db_escape_string($string) {
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from
@ -203,7 +203,7 @@ function serendipity_db_limit_sql($limitstring) {
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect() {
global $serendipity;
@ -240,7 +240,7 @@ function serendipity_db_reconnect() {
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query) {
global $serendipity;

6
include/db/mysql.inc.php
View File

@ -226,7 +226,7 @@ function serendipity_db_escape_string($string) {
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from
@ -252,7 +252,7 @@ function serendipity_db_limit_sql($limitstring) {
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect() {
global $serendipity;
@ -290,7 +290,7 @@ function serendipity_db_reconnect() {
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}',

6
include/db/mysqli.inc.php
View File

@ -193,7 +193,7 @@ function serendipity_db_escape_string($string) {
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from
@ -219,7 +219,7 @@ function serendipity_db_limit_sql($limitstring) {
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect() {
global $serendipity;
@ -260,7 +260,7 @@ function serendipity_db_reconnect() {
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}',

6
include/db/pdo-postgres.inc.php
View File

@ -45,7 +45,7 @@ function serendipity_db_in_sql($col, &$search_ids, $type = ' OR ') {
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect() {
global $serendipity;
@ -90,7 +90,7 @@ function serendipity_db_escape_string($string) {
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from
@ -267,7 +267,7 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}',

10
include/db/pdo-sqlite.inc.php
View File

@ -14,9 +14,9 @@ function serendipity_db_logmsg($msgstr) {
* Yeah. This sucks. Don't tell me!
*
* @access private
* @param ressource The row ressource handle
* @param resource The row resource handle
* @param int Bitmask to tell whether to fetch numerical/associative arrays
* @return array Propper array containing the ressource results
* @return array Propper array containing the resource results
*/
function serendipity_db_sqlite_fetch_array($row, $type = PDO::FETCH_ASSOC)
{
@ -95,7 +95,7 @@ function serendipity_db_in_sql($col, &$search_ids, $type = ' OR ') {
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect() {
global $serendipity;
@ -123,7 +123,7 @@ function serendipity_db_escape_string($string) {
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from
@ -286,7 +286,7 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}');

6
include/db/postgres.inc.php
View File

@ -42,7 +42,7 @@ function serendipity_db_in_sql($col, &$search_ids, $type = ' OR ') {
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect() {
global $serendipity;
@ -93,7 +93,7 @@ function serendipity_db_escape_string($string) {
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from
@ -278,7 +278,7 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}',

10
include/db/sqlite.inc.php
View File

@ -34,7 +34,7 @@ function serendipity_db_end_transaction($commit){
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect()
{
@ -138,9 +138,9 @@ function serendipity_db_insert_id()
* Yeah. This sucks. Don't tell me!
*
* @access private
* @param ressource The row ressource handle
* @param resource The row resource handle
* @param int Bitmask to tell whether to fetch numerical/associative arrays
* @return array Propper array containing the ressource results
* @return array Propper array containing the resource results
*/
function serendipity_db_sqlite_fetch_array($res, $type = SQLITE_BOTH)
{
@ -331,7 +331,7 @@ function serendipity_db_probe($hash, &$errs)
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query)
{
@ -352,7 +352,7 @@ function serendipity_db_schema_import($query)
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from

10
include/db/sqlite3.inc.php
View File

@ -40,7 +40,7 @@ function serendipity_db_end_transaction($commit){
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect()
{
@ -134,9 +134,9 @@ function serendipity_db_insert_id()
* Yeah. This sucks. Don't tell me!
*
* @access private
* @param ressource The row ressource handle
* @param resource The row resource handle
* @param int Bitmask to tell whether to fetch numerical/associative arrays
* @return array Propper array containing the ressource results
* @return array Propper array containing the resource results
*/
function serendipity_db_sqlite_fetch_array($res, $type = SQLITE3_BOTH)
{
@ -339,7 +339,7 @@ function serendipity_db_probe($hash, &$errs)
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query)
{
@ -361,7 +361,7 @@ function serendipity_db_schema_import($query)
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from

10
include/db/sqlite3oo.inc.php
View File

@ -40,7 +40,7 @@ function serendipity_db_end_transaction($commit){
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect()
{
@ -134,9 +134,9 @@ function serendipity_db_insert_id()
* Yeah. This sucks. Don't tell me!
*
* @access private
* @param ressource The row ressource handle
* @param resource The row resource handle
* @param int Bitmask to tell whether to fetch numerical/associative arrays
* @return array Propper array containing the ressource results
* @return array Propper array containing the resource results
*/
function serendipity_db_sqlite_fetch_array($res, $type = SQLITE3_BOTH)
{
@ -354,7 +354,7 @@ function serendipity_db_probe($hash, &$errs)
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query)
{
@ -376,7 +376,7 @@ function serendipity_db_schema_import($query)
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from

6
include/db/sqlrelay.inc.php
View File

@ -361,7 +361,7 @@ function serendipity_db_escape_string($str) {
}
/**
* Returns the option to a LIMIT SQL statement, because it varies accross DB systems
* Returns the option to a LIMIT SQL statement, because it varies across DB systems
*
* @access public
* @param int Number of the first row to return data from
@ -403,7 +403,7 @@ function serendipity_db_limit_sql($limitstring) {
* Connect to the configured Database
*
* @access public
* @return ressource connection handle
* @return resource connection handle
*/
function serendipity_db_connect() {
global $serendipity;
@ -446,7 +446,7 @@ function serendipity_db_reconnect() {
*
* @access public
* @param string SQL query with template variables to convert
* @return ressource SQL ressource handle of the executed query
* @return resource SQL resource handle of the executed query
*/
function serendipity_db_schema_import($query) {
global $serendipity;

2
include/functions.inc.php
View File

@ -793,7 +793,7 @@ function serendipity_track_referrer($entry = 0) {
/**
* Garbage Collection for suppressed referrers
*
* "Bad" referrers, that only occured once to your entry are put within a
* "Bad" referrers, that only occurred once to your entry are put within a
* SUPPRESS database table. Entries contained there will be cleaned up eventually.
*
* @access public

4
include/functions_calendars.inc.php
View File

@ -13,7 +13,7 @@ if (defined('S9Y_FRAMEWORK_CALENDARS')) {
@define('S9Y_FRAMEWORK_CALENDARS', true);
/**
* Gregorian to Persian Convertor
* Gregorian to Persian Converter
*
* @author farsiweb.info
* @access public
@ -65,7 +65,7 @@ function g2p($g_y, $g_m, $g_d){
}
/**
* Persian to Gregorian Convertor
* Persian to Gregorian Converter
*
* @author farsiweb.info
* @access public

6
include/functions_config.inc.php
View File

@ -480,7 +480,7 @@ function serendipity_checkAutologin($ident, $iv) {
}
/**
* Set a session cookie which can identify a user accross http/https boundaries
* Set a session cookie which can identify a user across http/https boundaries
*/
function serendipity_setAuthorToken() {
$hash = sha1(uniqid(rand(), true));
@ -895,7 +895,7 @@ function serendipity_probeInstallation($item) {
}
if (class_exists('SQLite3')) {
if ($has_pdo) {
$res['sqlite3oo'] = 'SQLite3 (OO) (Preferrably use PDO-SQlite!)';
$res['sqlite3oo'] = 'SQLite3 (OO) (Preferably use PDO-SQlite!)';
} else {
$res['sqlite3oo'] = 'SQLite3 (OO)';
}
@ -1247,7 +1247,7 @@ function serendipity_checkPermission($permName, $authorid = null, $returnMyGroup
* @access public
* @param array The array of groups the author should be a member of. All memberships that were present before and not contained in this array will be removed.
* @param int The ID of the author to update
* @param boolean If set to true, the groups can only be updated if the user has the adminUsersMaintainOthers privilege. If set to false, group memberships will be changable for any user.
* @param boolean If set to true, the groups can only be updated if the user has the adminUsersMaintainOthers privilege. If set to false, group memberships will be changeable for any user.
* @return
*/
function serendipity_updateGroups($groups, $authorid, $apply_acl = true) {

2
include/functions_entries_admin.inc.php
View File

@ -18,7 +18,7 @@ include_once(S9Y_INCLUDE_PATH . "include/functions_trackbacks.inc.php");
* @param string The URL where the entry form is submitted to
* @param array An array of hidden input fields that should be passed on to the HTML FORM
* @param array The entry superarray with your entry's contents
* @param string Any error messages that might have occured on the last run
* @param string Any error messages that might have occurred on the last run
* @return null
*/
function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = array(), $errMsg = "") {

2
include/functions_smarty.inc.php
View File

@ -626,7 +626,7 @@ function serendipity_smarty_printSidebar($params, &$smarty) {
*
* @access public
* @param array Smarty parameter input array:
* file: The filename you want to include (any file within your template directry or the 'default' template if not found)
* file: The filename you want to include (any file within your template directory or the 'default' template if not found)
* @param object Smarty object
* @return string The requested filename with full path
*/

4
include/functions_trackbacks.inc.php
View File

@ -109,7 +109,7 @@ function serendipity_pingback_autodiscover($loc, $body, $url=null) {
* @access public
* @param string The URL to send a trackback to
* @param string The XML data with the trackback contents
* @return string Reponse
* @return string Response
*/
function _serendipity_send($loc, $data, $contenttype = null) {
global $serendipity;
@ -164,7 +164,7 @@ function _serendipity_send($loc, $data, $contenttype = null) {
* @param string The author of our entry
* @param string The title of our entry
* @param string The text of our entry
* @param string A comparsion URL
* @param string A comparison URL
* @return string Response
*/

2
include/lang.inc.php
View File

@ -33,7 +33,7 @@ if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
// Try and include preferred language from the configurated setting
if (@include(S9Y_INCLUDE_PATH . 'lang/' . $charset . 'serendipity_lang_'. $serendipity['lang'] .'.inc.php') ) {
// Only here can we truely say the language is loaded
// Only here can we truly say the language is loaded
define('serendipity_LANG_LOADED', true);
if (function_exists('serendipity_db_reconnect')) {
serendipity_db_reconnect();

8
include/serendipity_smarty_class.inc.php
View File

@ -39,7 +39,7 @@ class Serendipity_Smarty_Security_Policy extends Smarty_Security
// This allows the fetch() and include calls to pull .tpl files from any directory,
// so that symlinked plugin directories outside the s9y path can be included properly.
// TODO / FUTURE: If Smarty will implement a seperation option to dissect fetch() from
// TODO / FUTURE: If Smarty will implement a separation option to dissect fetch() from
// {include} calls, we should only apply this workaround to fetch() calls.
// Redirecting fetch() as our custom function is too risky and has too high a performance
// impact.
@ -107,7 +107,7 @@ class Serendipity_Smarty extends Smarty
// some documentary from the smarty forum
/*
Adressing a specific $template_dir (see 3.1 release notes)
Addressing a specific $template_dir (see 3.1 release notes)
Smarty 3.1 introduces the $template_dir index notation.
$smarty->fetch('[foo]bar.tpl') and {include file="[foo]bar.tpl"} require the template bar.tpl to be loaded from $template_dir['foo'];
@ -139,7 +139,7 @@ class Serendipity_Smarty extends Smarty
$template_dirs[] = S9Y_TEMPLATE_SECUREDIR;
}
// disable plugin dir as added template dir is not adviced, if set security is enabled (backend & frontend need access to fetch plugin templates)
// disable plugin dir as added template dir is not advised, if set security is enabled (backend & frontend need access to fetch plugin templates)
$template_dirs[] = $serendipity['serendipityPath'] . 'plugins';
// add default template to addTemplate array, if not already set in engine
$template_dirs[] = S9Y_TEMPLATE_FALLBACK;
@ -263,7 +263,7 @@ class Serendipity_Smarty extends Smarty
}
/**
* wrapper for assign_by_ref - BC mode Smarty 2 -> 3 (Serendipity core uses assignByRef already - and nearly no occurances in additional plugins)
* wrapper for assign_by_ref - BC mode Smarty 2 -> 3 (Serendipity core uses assignByRef already - and nearly no occurrences in additional plugins)
*
* @param string $tpl_var the template variable name
* @param mixed &$value the referenced value to assign

2
plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
View File

@ -1073,7 +1073,7 @@ class serendipity_event_spartacus extends serendipity_event
} else {
$paths = preg_split('@/@', $basedir.$dir,-1,PREG_SPLIT_NO_EMPTY);
foreach ($paths as $path) {
// trying to change directory, if not succesfull, it means
// trying to change directory, if not successful, it means
// the directory does not exist and we must create it
if (!ftp_chdir($conn_id,$path)) {
if (!ftp_mkdir($conn_id,$path)) {

8
plugins/serendipity_event_textile/classTextile.php
View File

@ -353,7 +353,7 @@ class TextileBag
/**
* Class to allow contruction of HTML tags on conversion of an object to a string
* Class to allow construction of HTML tags on conversion of an object to a string
*
* Example usage...
*
@ -761,7 +761,7 @@ class Textile
* Gets a symbol definitions.
*
* This method can be used to get a symbol definition, or an
* array containg the full symbol table.
* array containing the full symbol table.
*
* @param string|null $name The name of the symbol, or NULL if requesting the symbol table
* @return array|string The symbol table or the requested symbol
@ -871,7 +871,7 @@ class Textile
$this->prepare($lite, $noimage, $rel);
$this->url_schemes = $this->unrestricted_url_schemes;
// Use of the $encode flag is discouraged. Calling textileEncode() is prefered.
// Use of the $encode flag is discouraged. Calling textileEncode() is preferred.
if ($encode) {
return $this->textileEncode($text);
}
@ -2721,7 +2721,7 @@ class Textile
/**
* Perfoms typographical glyph replacements within the input textile text.
* Performs typographical glyph replacements within the input textile text.
* The source text is split across HTML-like tags in order to avoid attempting glyph
* replacements within tags.
*

2
plugins/serendipity_plugin_comments/serendipity_plugin_comments.php
View File

@ -209,7 +209,7 @@ class serendipity_plugin_comments extends serendipity_plugin
if ($row['comment_url'] != '' && ( ($isTrackBack && ($showurls =='trackbacks' || $showurls =='all') || !$isTrackBack && ($showurls =='comments' || $showurls =='all')))) {
/* Fix invalid cases in protocoll part */
/* Fix invalid cases in protocol part */
$row['comment_url'] = preg_replace('@^http://@i','http://', $row['comment_url']);
$row['comment_url'] = preg_replace('@^https://@i','https://', $row['comment_url']);

6
serendipity_config.inc.php
View File

@ -83,10 +83,10 @@ $serendipity['max_last_modified'] = 60 * 60 * 24 * 7;
// that date. However it is still limited by the number below of maximum entries
$serendipity['max_fetch_limit'] = 50;
// How many bytes are allowed for fetching trackbacks, so that no binary files get accidently trackbacked?
// How many bytes are allowed for fetching trackbacks, so that no binary files get accidentally trackbacked?
$serendipity['trackback_filelimit'] = 150 * 1024;
// Allow "Access-Controll-Allow-Origin: *" to be used in sensible locations (RSS feed)
// Allow "Access-Control-Allow-Origin: *" to be used in sensible locations (RSS feed)
$serendipity['cors'] = false;
if (!isset($serendipity['fetchLimit'])) {
@ -290,7 +290,7 @@ for ($i = 0; $i < 15; $i++ ) {
// [internal callback function]: errorToExceptionHandler()
if (is_callable($serendipity['errorhandler'], false, $callable_name)) {
// set serendipity global error to exeption handler
// set serendipity global error to exception handler
set_error_handler($serendipity['errorhandler'], $errLevel); // See error_reporting() earlier to see which errors are passed to the handler, deending on $serendipity['production'].
}

2
templates/bulletproof/plugin_staticpage_related_category.tpl
View File

@ -45,7 +45,7 @@
{/if}
<div class="staticpage_related_category_entry_list">
{* standart - if you use it on a shared-s9y-installation you have to correct the path to staticpage-entries-listing.tpl *}
{* standard - if you use it on a shared-s9y-installation you have to correct the path to staticpage-entries-listing.tpl *}
{serendipity_fetchPrintEntries category=$staticpage_related_category_id template="../../plugins/serendipity_event_staticpage/staticpage-entries-listing.tpl" limit=5 noSticky="true"}
{* if you use your own static-entries.tpl in your template, take this: *}

2
templates/bulletproof/sidebar.tpl
View File

@ -3,7 +3,7 @@
{/if}
{foreach from=$plugindata item=item}
{if $item.class == "serendipity_plugin_quicksearch" and $template_option.sitenav_quicksearch == 'true' and ($template_option.sitenavpos == 'above' or $template_option.sitenavpos == 'below')}
<!-- do nothing thereby supressing quicksearch in the sidebar when enabled in -->
<!-- do nothing thereby suppressing quicksearch in the sidebar when enabled in -->
<!-- navigation menu bar and ONLY when navigation bar is above or below header -->
{else}
<div class="serendipitySideBarItem container_{$item.class}">

2
templates/bulletproof/style.css
View File

@ -451,7 +451,7 @@ input#serendipityQuickSearchTermField {
margin-left: 10px;
}
/* overide serendipitySideBarItem overflow: hidden just for sidebar quicksearch livesearch_result */
/* override serendipitySideBarItem overflow: hidden just for sidebar quicksearch livesearch_result */
.container_serendipity_quicksearch_plugin{
overflow: visible !important;
}

6
templates/default/YahooUI/treeview/treeview.js
View File

@ -327,7 +327,7 @@ YAHOO.widget.TreeView.getNode = function(treeId, nodeIndex) {
/**
* Adds an event. Replace with event manager when available
*
* @param el the elment to bind the handler to
* @param el the element to bind the handler to
* @param {string} sType the type of event handler
* @param {function} fn the callback to invoke
* @param {boolean} capture if true event is capture phase, bubble otherwise
@ -1016,7 +1016,7 @@ YAHOO.widget.Node.prototype = {
},
/**
* Get the markup for the node. This is designed to be overrided so that we can
* Get the markup for the node. This is designed to be overridden so that we can
* support different types of nodes.
*
* @return {string} the html for this node
@ -1062,7 +1062,7 @@ YAHOO.widget.RootNode.prototype.getNodeHtml = function() {
/**
* @class The default node presentation. The first parameter should be
* either a string that will be used as the node's label, or an object
* that has a string propery called label. By default, the clicking the
* that has a string property called label. By default, the clicking the
* label will toggle the expanded/collapsed state of the node. By
* changing the href property of the instance, this behavior can be
* changed so that the label will go to the specified href.