From f15078d3219f2b44de88a3a8cc1bdb8782f299ab Mon Sep 17 00:00:00 2001 From: durandalwoz Date: Tue, 28 Jun 2016 03:24:18 -0300 Subject: [PATCH 1/5] Encoding fix Fixes problems with accented weekdays in Spanish other languages --- e107_handlers/date_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php index 0f4365f61..c62e29b29 100644 --- a/e107_handlers/date_handler.php +++ b/e107_handlers/date_handler.php @@ -197,7 +197,7 @@ class convert break; } - return strftime($mask, $datestamp); + return utf8_encode(strftime($mask, $datestamp)); } From 0d5b1e99882023c30897a2e852d4b3ac464ea96a Mon Sep 17 00:00:00 2001 From: durandalwoz Date: Tue, 28 Jun 2016 03:25:46 -0300 Subject: [PATCH 2/5] Avatar shortcode for forum_template Displays the avatar for the last post user --- .../forum/shortcodes/batch/forum_shortcodes.php | 4 ++++ .../shortcodes/batch/viewforum_shortcodes.php | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php index e68decd18..e06980138 100644 --- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php @@ -699,4 +699,8 @@ $gen = new convert; return $frm->breadcrumb($breadarray); } + function sc_avatar($opts) + { + return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts); + } } diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index ecc2049af..09b23e5f1 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -888,5 +888,19 @@ $LASTPOSTUSER = $this->var['lastpost_username']; } */ + function sc_avatar($opts) + { + if (isset($this->var['thread_id'])) + { + return e107::getParser()->toAvatar(e107::user($this->var['thread_lastuser']),$opts); + } + elseif (isset($this->var['forum_id'])) + { + return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts); + } + + return ''; + // return print_r($this->var); + } } ?> \ No newline at end of file From e9fe7ecc2ef5f2ab8be681ad8c4f530a0c8ab93f Mon Sep 17 00:00:00 2001 From: durandalwoz Date: Tue, 28 Jun 2016 03:26:21 -0300 Subject: [PATCH 3/5] Revert "Avatar shortcode for forum_template" This reverts commit 0d5b1e99882023c30897a2e852d4b3ac464ea96a. --- .../forum/shortcodes/batch/forum_shortcodes.php | 4 ---- .../shortcodes/batch/viewforum_shortcodes.php | 14 -------------- 2 files changed, 18 deletions(-) diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php index e06980138..e68decd18 100644 --- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php @@ -699,8 +699,4 @@ $gen = new convert; return $frm->breadcrumb($breadarray); } - function sc_avatar($opts) - { - return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts); - } } diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index 09b23e5f1..ecc2049af 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -888,19 +888,5 @@ $LASTPOSTUSER = $this->var['lastpost_username']; } */ - function sc_avatar($opts) - { - if (isset($this->var['thread_id'])) - { - return e107::getParser()->toAvatar(e107::user($this->var['thread_lastuser']),$opts); - } - elseif (isset($this->var['forum_id'])) - { - return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts); - } - - return ''; - // return print_r($this->var); - } } ?> \ No newline at end of file From d4249662c7763d9e5a0e4489842bfbab8965110d Mon Sep 17 00:00:00 2001 From: durandalwoz Date: Tue, 28 Jun 2016 03:26:48 -0300 Subject: [PATCH 4/5] Revert "Revert "Avatar shortcode for forum_template"" This reverts commit e9fe7ecc2ef5f2ab8be681ad8c4f530a0c8ab93f. --- .../forum/shortcodes/batch/forum_shortcodes.php | 4 ++++ .../shortcodes/batch/viewforum_shortcodes.php | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php index e68decd18..e06980138 100644 --- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php @@ -699,4 +699,8 @@ $gen = new convert; return $frm->breadcrumb($breadarray); } + function sc_avatar($opts) + { + return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts); + } } diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index ecc2049af..09b23e5f1 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -888,5 +888,19 @@ $LASTPOSTUSER = $this->var['lastpost_username']; } */ + function sc_avatar($opts) + { + if (isset($this->var['thread_id'])) + { + return e107::getParser()->toAvatar(e107::user($this->var['thread_lastuser']),$opts); + } + elseif (isset($this->var['forum_id'])) + { + return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts); + } + + return ''; + // return print_r($this->var); + } } ?> \ No newline at end of file From d5c01c603b3e2d56616fea6d93749aebc04d019a Mon Sep 17 00:00:00 2001 From: durandalwoz Date: Tue, 28 Jun 2016 03:32:09 -0300 Subject: [PATCH 5/5] Avatar shortcode for viewforum template Displays the avatar for both forum last post and thread last post user --- e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php | 1 - 1 file changed, 1 deletion(-) diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index 09b23e5f1..7301d08ac 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -900,7 +900,6 @@ $LASTPOSTUSER = $this->var['lastpost_username']; } return ''; - // return print_r($this->var); } } ?> \ No newline at end of file