From 1c88ae1a9781a84fd0bdb3b198697f688455bf7b Mon Sep 17 00:00:00 2001 From: Tatevik Date: Tue, 12 May 2026 21:17:55 +0400 Subject: [PATCH 1/5] Add preselect to subscribe page --- public_html/lists/admin/spageedit.php | 34 +++++++++++++++++++++-- public_html/lists/admin/subscribelib2.php | 27 ++++++++++++++++-- public_html/lists/index.php | 18 ++++++++++-- 3 files changed, 71 insertions(+), 8 deletions(-) diff --git a/public_html/lists/admin/spageedit.php b/public_html/lists/admin/spageedit.php index e1f569790..12a74a1e8 100644 --- a/public_html/lists/admin/spageedit.php +++ b/public_html/lists/admin/spageedit.php @@ -108,10 +108,21 @@ } Sql_Query(sprintf('replace into %s (id,name,data) values(%d,"attributes","%s")', $tables['subscribepage_data'], $id, $attributes)); + $preselectList = 0; + if (!empty($_POST['preselectlist'])) { + $preselectList = (int) $_POST['preselectlist']; + } if (isset($_POST['list']) && is_array($_POST['list'])) { + if (!$preselectList || !isset($_POST['list'][$preselectList])) { + $preselectList = 0; + } Sql_Query(sprintf('replace into %s (id,name,data) values(%d,"lists","%s")', $tables['subscribepage_data'], $id, implode(',', $_POST['list']))); + } else { + $preselectList = 0; } + Sql_Query(sprintf('replace into %s (id,name,data) values(%d,"preselectlist","%d")', + $tables['subscribepage_data'], $id, $preselectList)); //## Store plugin data foreach ($GLOBALS['plugins'] as $pluginname => $plugin) { @@ -144,6 +155,7 @@ $data['unsubscribesubject'] = getConfig('unsubscribesubject'); $data['htmlchoice'] = 'htmlonly'; $data['emaildoubleentry'] = 'yes'; +$data['preselectlist'] = 0; $data['rssdefault'] = 'daily'; //Leftover from the preplugin era $data['rssintro'] = s('Please indicate how often you want to receive messages'); //Leftover from the preplugin era $selected_lists = array(); @@ -382,10 +394,26 @@ } } $listsHTML .= '

'; +$preselectList = (int) $data['preselectlist']; +if (!in_array($preselectList, $selected_lists)) { + $preselectList = 0; +} +$listsHTML .= sprintf('

', + empty($preselectList) ? 'checked="checked"' : '', + s('Do not preselect any list')); while ($row = Sql_Fetch_Array($req)) { - $listsHTML .= sprintf('
%s
', - $row['id'], $row['id'], in_array($row['id'], $selected_lists) ? 'checked="checked"' : '', - stripslashes($row['name']), htmlspecialchars(stripslashes($row['description']))); + $listSelected = in_array($row['id'], $selected_lists); + $listsHTML .= sprintf( + '
%s
', + $row['id'], + $row['id'], + $listSelected ? 'checked="checked"' : '', + stripslashes($row['name']), + $row['id'], + $preselectList == $row['id'] ? 'checked="checked"' : '', + s('Preselect'), + htmlspecialchars(stripslashes($row['description'])) + ); } $listsHTML .= ''; diff --git a/public_html/lists/admin/subscribelib2.php b/public_html/lists/admin/subscribelib2.php index cc014e97a..167f7fd76 100644 --- a/public_html/lists/admin/subscribelib2.php +++ b/public_html/lists/admin/subscribelib2.php @@ -716,9 +716,10 @@ /** * @param int $userid * @param string $lists_to_show + * @param int $preselect_list_id * @return string */ -function ListAvailableLists($userid = 0, $lists_to_show = '') +function ListAvailableLists($userid = 0, $lists_to_show = '', $preselect_list_id = 0) { global $tables; if (isset($_POST['list'])) { @@ -730,6 +731,9 @@ function ListAvailableLists($userid = 0, $lists_to_show = '') } else { $list = ''; } + $hasExplicitListSelection = isset($_POST['list']) + || (!isset($_POST['subscribe']) && isset($_GET['list']) && preg_match("/^(\d+,)*\d+$/", $_GET['list'])); + $preselect_list_id = (int) $preselect_list_id; $subselect = ''; $listset = array(); $subscribed = array(); @@ -766,7 +770,14 @@ function ListAvailableLists($userid = 0, $lists_to_show = '') while ($row = Sql_fetch_array($catresult)) { - $listspercategory[] = array('id' => $row ['id'], 'name' => $row ['name'], 'description' => $row ['description'], 'active' => $row ['active'], 'category' => $row ['category']); + $listspercategory[] = array( + 'id' => $row['id'], + 'name' => $row['name'], + 'description' => $row['description'], + 'active' => $row['active'], + 'category' => $row['category'], + 'preselect' => isset($row['preselect']) ? $row['preselect'] : 0, + ); } @@ -803,6 +814,12 @@ function ListAvailableLists($userid = 0, $lists_to_show = '') if (Sql_Affected_Rows()) { $html .= 'checked="checked"'; } + } elseif (!$hasExplicitListSelection) { + if ($preselect_list_id && $preselect_list_id == $listelement['id']) { + $html .= 'checked="checked"'; + } elseif (!$preselect_list_id && !empty($listelement['preselect'])) { + $html .= 'checked="checked"'; + } } @@ -844,6 +861,12 @@ function ListAvailableLists($userid = 0, $lists_to_show = '') if (Sql_Affected_Rows()) { $html .= 'checked="checked"'; } + } elseif (!$hasExplicitListSelection) { + if ($preselect_list_id && $preselect_list_id == $row['id']) { + $html .= 'checked="checked"'; + } elseif (!$preselect_list_id && !empty($row['preselect'])) { + $html .= 'checked="checked"'; + } } $html .= " />
'; $desc = nl2br(disableJavascript(stripslashes($row['description']))); diff --git a/public_html/lists/index.php b/public_html/lists/index.php index db494c541..81b52186e 100644 --- a/public_html/lists/index.php +++ b/public_html/lists/index.php @@ -532,7 +532,11 @@ function checkEmail() } } - $html .= ListAvailableLists($userid, $GLOBALS['pagedata']['lists']); + $html .= ListAvailableLists( + $userid, + $GLOBALS['pagedata']['lists'], + isset($GLOBALS['pagedata']['preselectlist']) ? (int) $GLOBALS['pagedata']['preselectlist'] : 0 + ); if (isBlackListedID($userid)) { $html .= $GLOBALS['strYouAreBlacklisted']; } @@ -690,7 +694,11 @@ function checkGroup(name,value) $html .= $plugin->displaySubscriptionChoice($GLOBALS['pagedata']); } } - $html .= ListAvailableLists('', $GLOBALS['pagedata']['lists']); + $html .= ListAvailableLists( + '', + $GLOBALS['pagedata']['lists'], + isset($GLOBALS['pagedata']['preselectlist']) ? (int) $GLOBALS['pagedata']['preselectlist'] : 0 + ); if (empty($GLOBALS['pagedata']['button'])) { $GLOBALS['pagedata']['button'] = $GLOBALS['strSubmit']; @@ -799,7 +807,11 @@ function subscribePage2($id) $html .= formStart(); $html .= '
'.strip_tags($GLOBALS['pagedata']['intro']).''; $html .= ListAttributes2011($attributes,$attributedata,$GLOBALS['pagedata']["htmlchoice"],0,$GLOBALS['pagedata']['emaildoubleentry']); - $html .= ListAvailableLists("",$GLOBALS['pagedata']["lists"]); + $html .= ListAvailableLists( + "", + $GLOBALS['pagedata']["lists"], + isset($GLOBALS['pagedata']['preselectlist']) ? (int) $GLOBALS['pagedata']['preselectlist'] : 0 + ); if (empty($GLOBALS['pagedata']['button'])) { $GLOBALS['pagedata']['button'] = $GLOBALS['strSubmit']; From 800ec4fec4b9d05952b3d4fbd273b46cf87f7f02 Mon Sep 17 00:00:00 2001 From: Tatevik Date: Thu, 14 May 2026 12:43:34 +0400 Subject: [PATCH 2/5] Refactor list preselection logic into `shouldPreselectList` helper function --- public_html/lists/admin/subscribelib2.php | 44 ++++++++++++++++------- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/public_html/lists/admin/subscribelib2.php b/public_html/lists/admin/subscribelib2.php index 167f7fd76..eb5b6a16a 100644 --- a/public_html/lists/admin/subscribelib2.php +++ b/public_html/lists/admin/subscribelib2.php @@ -713,6 +713,24 @@ } } +/** + * Determine whether a list checkbox should be preselected. + * + * @param bool $hasExplicitListSelection + * @param int $preselect_list_id + * @param int $listId + * @param mixed $rowPreselect + * @return bool + */ +function shouldPreselectList($hasExplicitListSelection, $preselect_list_id, $listId, $rowPreselect) +{ + return !$hasExplicitListSelection && + ( + ($preselect_list_id && $preselect_list_id == $listId) || + (!$preselect_list_id && !empty($rowPreselect)) + ); +} + /** * @param int $userid * @param string $lists_to_show @@ -814,12 +832,13 @@ function ListAvailableLists($userid = 0, $lists_to_show = '', $preselect_list_id if (Sql_Affected_Rows()) { $html .= 'checked="checked"'; } - } elseif (!$hasExplicitListSelection) { - if ($preselect_list_id && $preselect_list_id == $listelement['id']) { - $html .= 'checked="checked"'; - } elseif (!$preselect_list_id && !empty($listelement['preselect'])) { - $html .= 'checked="checked"'; - } + } elseif (shouldPreselectList( + $hasExplicitListSelection, + $preselect_list_id, + $listelement['id'], + $listelement['preselect'] + )) { + $html .= 'checked="checked"'; } @@ -861,12 +880,13 @@ function ListAvailableLists($userid = 0, $lists_to_show = '', $preselect_list_id if (Sql_Affected_Rows()) { $html .= 'checked="checked"'; } - } elseif (!$hasExplicitListSelection) { - if ($preselect_list_id && $preselect_list_id == $row['id']) { - $html .= 'checked="checked"'; - } elseif (!$preselect_list_id && !empty($row['preselect'])) { - $html .= 'checked="checked"'; - } + } elseif (shouldPreselectList( + $hasExplicitListSelection, + $preselect_list_id, + $row['id'], + isset($row['preselect']) ? $row['preselect'] : 0 + )) { + $html .= 'checked="checked"'; } $html .= " />
'; $desc = nl2br(disableJavascript(stripslashes($row['description']))); From 14f38d2d03323bc58a039d68b4f8e800a25bcde1 Mon Sep 17 00:00:00 2001 From: Tatevik Date: Tue, 19 May 2026 15:32:03 +0400 Subject: [PATCH 3/5] Null safe for php ^8.1 --- public_html/lists/admin/languages.php | 4 ++-- public_html/lists/admin/spageedit.php | 34 +++++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/public_html/lists/admin/languages.php b/public_html/lists/admin/languages.php index 098169cd1..4ee97ef0d 100644 --- a/public_html/lists/admin/languages.php +++ b/public_html/lists/admin/languages.php @@ -297,7 +297,7 @@ public function databaseTranslation($text) } $tr = Sql_Fetch_Row_Query(sprintf('select translation from '.$GLOBALS['tables']['i18n'].' where original = "%s" and lan = "%s"', - sql_escape(trim($text)), $this->language), 1); + sql_escape(trim($text ?? '')), $this->language), 1); if (empty($tr[0])) { $tr = Sql_Fetch_Row_Query(sprintf('select translation from '.$GLOBALS['tables']['i18n'].' where original = "%s" and lan = "%s"', sql_escape($text), $this->language), 1); @@ -514,7 +514,7 @@ public function getTranslation($text) public function get($text) { - if (trim($text) == '') { + if (trim($text ?? '') == '') { return ''; } if (strip_tags($text) == '') { diff --git a/public_html/lists/admin/spageedit.php b/public_html/lists/admin/spageedit.php index 12a74a1e8..c44f20dc2 100644 --- a/public_html/lists/admin/spageedit.php +++ b/public_html/lists/admin/spageedit.php @@ -204,7 +204,7 @@ $generalinfoHTML .= sprintf('', s('Title'), - htmlspecialchars(stripslashes($data['title']))); + htmlspecialchars(stripslashes($data['title'] ?? ''))); $language_files = array(); $language_file = $GLOBALS['language_module']; @@ -232,24 +232,24 @@ $generalinfoHTML .= sprintf('', s('Intro'), - htmlspecialchars(stripslashes($data['intro']))); + htmlspecialchars(stripslashes($data['intro'] ?? ''))); $generalinfoHTML .= sprintf('', s('Header'), - htmlspecialchars(stripslashes($data['header']))); + htmlspecialchars(stripslashes($data['header'] ?? ''))); $generalinfoHTML .= sprintf('', s('Footer'), - htmlspecialchars(stripslashes($data['footer']))); + htmlspecialchars(stripslashes($data['footer'] ?? ''))); $generalinfoHTML .= sprintf('', s('Thank you page'), - htmlspecialchars(stripslashes($data['thankyoupage']))); + htmlspecialchars(stripslashes($data['thankyoupage'] ?? ''))); $generalinfoHTML .= sprintf('', s('Text to display when subscription with an AJAX request was successful'), - htmlspecialchars(stripslashes($data['ajax_subscribeconfirmation']))); + htmlspecialchars(stripslashes($data['ajax_subscribeconfirmation'] ?? ''))); $generalinfoHTML .= sprintf('', s('Text for Button'), - htmlspecialchars(stripslashes($data['button']))); + htmlspecialchars(stripslashes($data['button'] ?? ''))); $generalinfoHTML .= sprintf('', s('HTML Email choice')); $generalinfoHTML .= sprintf(' %s
', @@ -293,24 +293,24 @@ $transactionHTML .= '

'.s('Message they receive when they subscribe').'

'; $transactionHTML .= sprintf('', s('Subject'), - htmlspecialchars(stripslashes($data['subscribesubject']))); + htmlspecialchars(stripslashes($data['subscribesubject'] ?? ''))); $transactionHTML .= sprintf('', s('Message'), - htmlspecialchars(stripslashes($data['subscribemessage']))); + htmlspecialchars(stripslashes($data['subscribemessage'] ?? ''))); $transactionHTML .= '

'.s('Message they receive when they confirm their subscription').'

'; $transactionHTML .= sprintf('', s('Subject'), - htmlspecialchars(stripslashes($data['confirmationsubject']))); + htmlspecialchars(stripslashes($data['confirmationsubject'] ?? ''))); $transactionHTML .= sprintf('', s('Message'), - htmlspecialchars(stripslashes($data['confirmationmessage']))); + htmlspecialchars(stripslashes($data['confirmationmessage'] ?? ''))); $transactionHTML .= '

'.s('Message they receive when they unsubscribe').'

'; $transactionHTML .= sprintf('', s('Subject'), - htmlspecialchars(stripslashes($data['unsubscribesubject']))); + htmlspecialchars(stripslashes($data['unsubscribesubject'] ?? ''))); $transactionHTML .= sprintf('', s('Message'), - htmlspecialchars(stripslashes($data['unsubscribemessage']))); + htmlspecialchars(stripslashes($data['unsubscribemessage'] ?? ''))); $sendtest_content = sprintf('
' .$sendtestresult.' @@ -346,9 +346,9 @@ $attributesHTML .= ''; $attributesHTML .= ''; $attributesHTML .= ''; - $attributesHTML .= ''; + $attributesHTML .= ''; $attributesHTML .= ''; - $attributesHTML .= ''; + $attributesHTML .= ''; $attributesHTML .= ''; $attributesHTML .= '
'.s('Attribute').': '.$row['id'].''.s('Check this box to use this attribute in the page').'
'.s('Name').':

'.htmlspecialchars(stripslashes($row['name'])).'

'.s('Name').':

'.htmlspecialchars(stripslashes($row['name'] ?? '')).'

'.s('Type').':

'.s($row['type']).'

'.s('Default Value').':
'.s('Default Value').':
'.s('Order of Listing').': '.s('Is this attribute required?').': Date: Tue, 19 May 2026 19:15:33 +0400 Subject: [PATCH 4/5] place in a table for better readability --- public_html/lists/admin/spageedit.php | 61 +++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/public_html/lists/admin/spageedit.php b/public_html/lists/admin/spageedit.php index c44f20dc2..ccd48fa80 100644 --- a/public_html/lists/admin/spageedit.php +++ b/public_html/lists/admin/spageedit.php @@ -370,7 +370,7 @@ } $listsHTML = '

'.s('Select the lists to offer').'

'; -$listsHTML .= '
'; +$listsHTML .= '
'; $listsHTML .= sprintf('
', s('Display list categories')); $listsHTML .= sprintf('%s
', @@ -398,23 +398,38 @@ if (!in_array($preselectList, $selected_lists)) { $preselectList = 0; } -$listsHTML .= sprintf('

', - empty($preselectList) ? 'checked="checked"' : '', - s('Do not preselect any list')); +$listsHTML .= ''; +$listsHTML .= sprintf( + '', + ucfirst(s('Select')), + ucfirst(s('Default')), + ucfirst(s('Description')) +); +$listsHTML .= ''; while ($row = Sql_Fetch_Array($req)) { $listSelected = in_array($row['id'], $selected_lists); + $listName = htmlspecialchars(stripslashes($row['name'] ?? ''), ENT_QUOTES); + $listDescription = htmlspecialchars(stripslashes($row['description'] ?? ''), ENT_QUOTES); + if ($listDescription === '') { + $listDescription = ' '; + } $listsHTML .= sprintf( - '
%s
', + '', $row['id'], $row['id'], $listSelected ? 'checked="checked"' : '', - stripslashes($row['name'] ?? ''), + $listName, $row['id'], $preselectList == $row['id'] ? 'checked="checked"' : '', - s('Preselect'), - htmlspecialchars(stripslashes($row['description'] ?? '')) + $listDescription ); } +$listsHTML .= sprintf( + '', + empty($preselectList) ? 'checked="checked"' : '', + s('none') +); +$listsHTML .= '
%s%s%s
%s
'; $listsHTML .= '
'; @@ -429,6 +444,36 @@ echo '
'; // accordion +echo ' +'; + $ownerHTML = $singleOwner = ''; $adminCount = 0; if (isSuperUser() || accessLevel('spageedit') == 'all') { From 7d99f48754f69bc74291c2621b32fdfd04c46dd1 Mon Sep 17 00:00:00 2001 From: Tatevik Date: Thu, 21 May 2026 23:04:45 +0400 Subject: [PATCH 5/5] After review --- public_html/lists/admin/spageedit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public_html/lists/admin/spageedit.php b/public_html/lists/admin/spageedit.php index ccd48fa80..61df0aad4 100644 --- a/public_html/lists/admin/spageedit.php +++ b/public_html/lists/admin/spageedit.php @@ -386,6 +386,7 @@ } else { $listsHTML .= '
'.s('If you do not choose a list here, all public lists will be displayed.'); + $listsHTML .= '
'.s('One list may be chosen to be selected by default on the subscribe page.'); $hideSingle = getConfig('hide_single_list'); if ($hideSingle) { $listsHTML .= '
'.s('If you choose one list only, a checkbox for this list will not be displayed and the subscriber will automatically be added to this list.');