From a91973cfaa0941f168388b043d536cd0f64f0fb7 Mon Sep 17 00:00:00 2001 From: Ian Date: Fri, 8 Jan 2016 18:07:31 +0100 Subject: [PATCH] 3.59 guestbook callback switch --- serendipity_event_guestbook/ChangeLog | 7 +++ serendipity_event_guestbook/README | 9 +++ .../plugin_guestbook_backend_header.tpl | 6 +- .../serendipity_event_guestbook.php | 60 +++++++++---------- .../serendipity_plugin_guestbook.php | 14 ++--- 5 files changed, 53 insertions(+), 43 deletions(-) diff --git a/serendipity_event_guestbook/ChangeLog b/serendipity_event_guestbook/ChangeLog index 0b5e3d44..5c87022a 100644 --- a/serendipity_event_guestbook/ChangeLog +++ b/serendipity_event_guestbook/ChangeLog @@ -1,3 +1,10 @@ +3.59: +----- + * Switch {call feedback} function to show success or error box + * Indent backend sidebar menu links markup + * Cleanup returning booleans where case expects break + + 3.58: & 1.25: ------------- * Added mysqli and check for supporting mysql and mysqli only diff --git a/serendipity_event_guestbook/README b/serendipity_event_guestbook/README index 74c7a018..5c02b642 100644 --- a/serendipity_event_guestbook/README +++ b/serendipity_event_guestbook/README @@ -95,6 +95,15 @@ S9Y :: GUESTBOOK :: DESIGN Happy designing! +------------------------------------- +| Version 3.59 | +------------------------------------- + + * Switch {call feedback} function to show success or error box + * Indent backend sidebar menu links markup + * Cleanup returning booleans where case expects break + + ------------------------------------- | Version 3.58 & 1.25 sidebar | ------------------------------------- diff --git a/serendipity_event_guestbook/plugin_guestbook_backend_header.tpl b/serendipity_event_guestbook/plugin_guestbook_backend_header.tpl index d13a4986..4d9d814d 100644 --- a/serendipity_event_guestbook/plugin_guestbook_backend_header.tpl +++ b/serendipity_event_guestbook/plugin_guestbook_backend_header.tpl @@ -1,10 +1,10 @@ {* - plugin_guestbook_backend_header.tpl v.3.57 2015-08-20 Ian + plugin_guestbook_backend_header.tpl v.3.59 2016-01-08 Ian *} {function name="feedback"}{* message and error feedback for approve, view, add issues *} -
- {$msg_header} +
+ {$msg_header} {if $guestbook_messages}
    {foreach $guestbook_messages AS $msg} diff --git a/serendipity_event_guestbook/serendipity_event_guestbook.php b/serendipity_event_guestbook/serendipity_event_guestbook.php index bf52c597..cb1c48eb 100644 --- a/serendipity_event_guestbook/serendipity_event_guestbook.php +++ b/serendipity_event_guestbook/serendipity_event_guestbook.php @@ -67,7 +67,7 @@ class serendipity_event_guestbook extends serendipity_event { 'dateformat' )); $propbag->add('author', 'Ian'); - $propbag->add('version', '3.58'); + $propbag->add('version', '3.59'); $propbag->add('requirements', array( 'serendipity' => '1.7.0', 'smarty' => '3.1.0', @@ -383,8 +383,7 @@ class serendipity_event_guestbook extends serendipity_event { break; default: - return false; - + break; } return true; } @@ -949,9 +948,9 @@ class serendipity_event_guestbook extends serendipity_event { if (is_numeric($_POST['guestbook']['id'])) $_POST['guestbook']['approved'] = 1; /*** - allow the spamblock wordfilter plugin to set an entry as non-approved, + Allow the spamblock plugin wordfilter to set an entry as non-approved, accordingly to stopwords and content filter set to 'moderation' in spamblock plugin. - extends new auto-moderate option setting to true in guestbooks config + Extends new auto-moderate option setting to true in guestbooks config ***/ // keep this for future finetuning via SPAMBLOCK plugin if (array_key_exists('moderate_comments', $ca)) { @@ -984,7 +983,7 @@ class serendipity_event_guestbook extends serendipity_event { $showapptxt = ($showapp && !$authenticated_user) ? ' ' . PLUGIN_GUESTBOOK_DBDONE_APP : ''; if (!$authenticated_user) { - // be strict here, since it could be null also + // be strict here, since it could also be NULL if (($showapp === false && $acapp === 0) || $serendipity['csuccess'] == 'moderate') { if (isset($serendipity[$forcemoderate[0]]) == 'moderate') { $showapptxt = '
    ' . $serendipity['moderate_reason'] . '
    ' . PLUGIN_GUESTBOOK_AUTOMODERATE_ERROR . PLUGIN_GUESTBOOK_DBDONE_APP; @@ -992,8 +991,9 @@ class serendipity_event_guestbook extends serendipity_event { } } + // this is a success msg! array_push($messages, PLUGIN_GUESTBOOK_MESSAGE . ': ' . PLUGIN_GUESTBOOK_DBDONE . $showapptxt); - // flag global meassage header to have successfully checked and safed the entry + // flag global meassage header to have successfully checked and saved the entry $serendipity['guestbook_message_header'] = true; // reset post values @@ -1057,7 +1057,7 @@ class serendipity_event_guestbook extends serendipity_event { } } - // generate frontend admin header section - if user logged in and action == delete entry + // generate frontend admin header section - if user logged in and action is delete entry if (!empty ($serendipity['GET']['adminAction']) && $_SESSION['serendipityAuthedUser'] === true) { // use permalink generally instead of subpage $is_guestbook_url = ($serendipity['rewrite'] != 'errordocs') ? $this->get_config('permalink') : $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?serendipity[subpage]=' . $this->get_config('pagetitle'); @@ -1085,7 +1085,7 @@ class serendipity_event_guestbook extends serendipity_event { break; default: - return false; + #return false; break; } } @@ -1319,7 +1319,6 @@ class serendipity_event_guestbook extends serendipity_event { $serendipity['head_title'] = $this->get_config('headline'); $serendipity['head_subtitle'] = $this->html_specialchars($serendipity['blogTitle']); } - break; case 'entry_display': @@ -1331,15 +1330,12 @@ class serendipity_event_guestbook extends serendipity_event { $eventData = array('clean_page' => true); } } - - return true; break; case 'entries_header': // this one really rolls up output: check form submit, generate entries and form $this->generate_Page(); - return true; break; case 'external_plugin': @@ -1375,9 +1371,9 @@ class serendipity_event_guestbook extends serendipity_event { $search = array('{TEMPLATE_PATH}', '{PLUGIN_PATH}'); $tfilecontent = str_replace($search, $serendipity['guestbook']['pluginpath'], @file_get_contents($tfile)); } - if (!empty($tfilecontent)) $this->cssEventData($eventData, $tfilecontent); - - return true; + if (!empty($tfilecontent)) { + $this->cssEventData($eventData, $tfilecontent); + } break; case 'backend_sidebar_entries': @@ -1386,10 +1382,8 @@ class serendipity_event_guestbook extends serendipity_event { return false; } if ($serendipity['version'][0] < 2) { - echo "\n".'
  • ' . PLUGIN_GUESTBOOK_ADMIN_NAME . '
    • '."\n"; + echo "\n".'
  • ' . PLUGIN_GUESTBOOK_ADMIN_NAME . '
    • '."\n"; } - - return true; break; case 'backend_sidebar_admin_appearance': @@ -1398,10 +1392,8 @@ class serendipity_event_guestbook extends serendipity_event { return false; } if ($serendipity['version'][0] > 1) { - echo "\n".'
  • ' . PLUGIN_GUESTBOOK_ADMIN_NAME . '
    • '."\n"; + echo "\n".'
  • ' . PLUGIN_GUESTBOOK_ADMIN_NAME . '
    • '."\n"; } - - return true; break; case 'backend_sidebar_entries_event_display_guestbook': @@ -1413,7 +1405,6 @@ class serendipity_event_guestbook extends serendipity_event { // show backend administration menu $this->gbadminpanel(); - return true; break; // put here all you css stuff you need for the backend of guestbook pages @@ -1438,6 +1429,7 @@ class serendipity_event_guestbook extends serendipity_event { // overwrite Serendipity 1.7 .serendipityAdminContent span !important if ($serendipity['version'][0] < '2') { ?> + #wrapGB .gb_entryhead span {color: #CCDDE7 !important;} #wrapGB .gb_entrybody span {color: #222 !important;} #wrapGB .msg_error, @@ -1468,16 +1460,16 @@ class serendipity_event_guestbook extends serendipity_event { border: 1px solid #aaa; color: #777; } + cssEventData($eventData, $tfilecontent); - - return true; + if (!empty($tfilecontent)) { + $this->cssEventData($eventData, $tfilecontent); + } break; default: - return false; break; } @@ -1552,7 +1544,9 @@ class serendipity_event_guestbook extends serendipity_event { // view all approved(1) entries in a table $ve = $this->backend_guestbook_view(1, 'gbview'); - if ($ve === false) $serendipity['smarty']->assign('is_gbadmin_noviewresult', true); + if ($ve === false) { + $serendipity['smarty']->assign('is_gbadmin_noviewresult', true); + } break; case 'gbapp': @@ -1576,7 +1570,7 @@ class serendipity_event_guestbook extends serendipity_event { // check form vars $this->checkSubmit(); } - +// HÄH????? if ($serendipity['guestbook_message_header'] === true) { if (count($messages) < 1 && $serendipity['guestbook_message_header'] === false) { array_push($messages, PLUGIN_GUESTBOOK_MESSAGE . ': ' . ERROR_UNKNOWN . '
    ' . ERROR_NOCAPTCHASET); @@ -1648,7 +1642,6 @@ class serendipity_event_guestbook extends serendipity_event { echo $this->parseTemplate('plugin_guestbook_backend_form.tpl'); } - break; case 'gbdb': @@ -1662,8 +1655,6 @@ class serendipity_event_guestbook extends serendipity_event { // add event form $this->backend_guestbook_dbclean(); } - - return true; break; case 'droptable': @@ -1674,7 +1665,6 @@ class serendipity_event_guestbook extends serendipity_event { $serendipity['GET']['guestbookdbclean'] = 'dberase'; $this->backend_guestbook_dbclean($reqbuild['month'], $reqbuild['year']); - return true; break; } @@ -1790,6 +1780,7 @@ class serendipity_event_guestbook extends serendipity_event { case 'dbinsert': $serendipity['smarty']->assign('is_guestbook_admin_insert', true); + break; case 'dberase': @@ -1839,6 +1830,7 @@ class serendipity_event_guestbook extends serendipity_event { case 'dbnixda': $serendipity['smarty']->assign('is_guestbook_admin_dbempty', true); + break; default: @@ -1846,6 +1838,7 @@ class serendipity_event_guestbook extends serendipity_event { } } + if ($serendipity['dbType'] == 'mysql' || $serendipity['dbType'] == 'mysqli') { // assign form array entries to smarty $serendipity['smarty']->assign( @@ -1900,6 +1893,7 @@ class serendipity_event_guestbook extends serendipity_event { */ function backend_guestbook_questionaire($text, $url, $addno, $addyes) { global $serendipity; + if (!is_object($serendipity['smarty'])) { serendipity_smarty_init(); } diff --git a/serendipity_event_guestbook/serendipity_plugin_guestbook.php b/serendipity_event_guestbook/serendipity_plugin_guestbook.php index 5c1fa12a..6ae4b38d 100644 --- a/serendipity_event_guestbook/serendipity_plugin_guestbook.php +++ b/serendipity_event_guestbook/serendipity_plugin_guestbook.php @@ -60,45 +60,45 @@ class serendipity_plugin_guestbook extends serendipity_plugin { $propbag->add('name', PLUGIN_GUESTSIDE_TITLE); $propbag->add('description',PLUGIN_GUESTSIDE_TITLE_BLAHBLAH); $propbag->add('default', PLUGIN_GUESTSIDE_NAME); - break; + break; case 'showemail': $propbag->add('type','boolean'); $propbag->add('name',PLUGIN_GUESTSIDE_SHOWEMAIL); $propbag->add('description',PLUGIN_GUESTSIDE_SHOWEMAIL_BLAHBLAH); $propbag->add('default','false'); - break; + break; case 'showhomepage': $propbag->add('type','boolean'); $propbag->add('name',PLUGIN_GUESTSIDE_SHOWHOMEPAGE); $propbag->add('description',PLUGIN_GUESTSIDE_SHOWHOMEPAGE_BLAHBLAH); $propbag->add('default','false'); - break; + break; case 'max_chars': $propbag->add('type','string'); $propbag->add('name',PLUGIN_GUESTSIDE_MAXCHARS); $propbag->add('description',PLUGIN_GUESTSIDE_MAXCHARS_BLAHBLAH); $propbag->add('default','50'); - break; + break; case 'max_items': $propbag->add('type','string'); $propbag->add('name',PLUGIN_GUESTSIDE_MAXITEMS); $propbag->add('description',PLUGIN_GUESTSIDE_MAXITEMS_BLAHBLAH); $propbag->add('default','1'); - break; + break; case 'dateformat' : $propbag->add('type', 'string'); $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT); $propbag->add('description', sprintf(GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH, '%a, %d.%m.%Y %H:%M')); $propbag->add('default', '%a, %d.%m.%Y %H:%M'); - break; + break; default: - return false; + break; } return true; }