diff --git a/admin/class-bread-admin.php b/admin/class-bread-admin.php
index 29aa161..97e5730 100644
--- a/admin/class-bread-admin.php
+++ b/admin/class-bread-admin.php
@@ -394,9 +394,7 @@ function pwsix_process_settings_import()
$settings['authors'] = array(wp_get_current_user()->ID);
$this->bread->setOptions($settings);
update_option($this->bread->getOptionsName(), $this->bread->getOptions());
- setcookie('current-meeting-list', $this->bread->getRequestedSetting(), time() + 10);
- setcookie('bread_import_file', $import_file, time() + 10);
- wp_safe_redirect(admin_url('?page=bmlt-enabled-bread'));
+ return $file_name;
}
function my_theme_add_editor_styles()
{
@@ -469,6 +467,7 @@ function admin_submenu_link($parent_slug)
}
function admin_options_page()
{
+ $filename = '';
if (!empty($_POST['pwsix_action']) && (!isset($_POST['bmltmeetinglistsave']) || $_POST['bmltmeetinglistsave'] != 'Save Changes')) {
switch ($_POST['pwsix_action']) {
case 'settings_admin':
@@ -481,7 +480,7 @@ function admin_options_page()
$this->pwsix_process_settings_export();
break;
case 'import_settings':
- $this->pwsix_process_settings_import();
+ $filename = $this->pwsix_process_settings_import();
break;
default:
break;
@@ -491,7 +490,7 @@ function admin_options_page()
$this->bread->getConfigurationForSettingId($this->bread->getRequestedSetting());
}
include_once plugin_dir_path(__FILE__) . 'partials/bread-admin-display.php';
- (new Bread_AdminDisplay($this))->admin_options_page();
+ (new Bread_AdminDisplay($this))->admin_options_page($filename);
}
function pwsix_process_wizard()
{
diff --git a/admin/partials/bread-admin-display.php b/admin/partials/bread-admin-display.php
index 8600897..e927d3c 100644
--- a/admin/partials/bread-admin-display.php
+++ b/admin/partials/bread-admin-display.php
@@ -98,36 +98,36 @@ private function select_service_body_options(int $i)
';
- if (isset($_COOKIE['bread_import_file'])) {
- echo ''.esc_html(__('File loaded', 'bread')).'
';
+ if (!empty($filename)) {
+ echo '';
+ echo '
'.esc_html(__('File loaded: ', 'bread')).esc_html($filename).'
';
+ echo '
';
echo '
'.esc_html(__('You do not have permission to save this configuation!', 'bread')).'
';
+ echo '
'.esc_html(__('Your changes were successfully saved!', 'bread')).'
';
+ echo '';
+ echo '
'.esc_html(__('Your changes were successfully saved!', 'bread')).'
';
$num = delete_transient($this->bread->get_TransientKey($this->bread->getRequestedSetting()));
if ($num > 0) {
/* translators: string is number of cache entries deleted */
- echo "
" . esc_html(sprintf(__('%s Cache entries deleted', 'bread')), esc_attr($num))."
";
+ echo "
" . esc_html(sprintf(__('%s Cache entries deleted', 'bread'), esc_attr($num), 'bread'))."
";
}
+ echo '
|]*>|\))\s*,/i' => '\1',
+ '/,\s*(,| \(|<\/?p||<\/span><\/td>)/i' => '\1',
+ );
/**
* The constuctor sets things up so that we are ready to generate.
*
@@ -146,6 +164,16 @@ function __construct(Mpdf $mpdf, Bread $bread, array $result_meetings, Bread_For
$this->mpdf->SetWatermarkImage($this->options['watermark'], 0.2, 'F');
$this->mpdf->showWatermarkImage = true;
}
+ $this->clean_up = array(
+ // TineMCE sometimes inserts non-breaking spaces.
+ chr(194) . chr(160) => ' ',
+ // This line_break stuff seems to be some legacy mechanism
+ '
' => 'line_break',
+ '
' => 'line_break',
+ 'line_break line_break' => '
',
+ 'line_breakline_break' => '
',
+ 'line_break' => '
',
+ );
}
/**
* Generates the contents of the meeting list.
@@ -311,6 +339,20 @@ private function write_custom_section()
$this->mpdf->WriteHTML('td{font-size: ' . $this->options['custom_section_font_size'] . "pt;line-height:" . $this->options['custom_section_line_height'] . ';}', 1);
$this->writeHTMLwithAdditionalMeetinglist($data);
}
+ /**
+ * Avoid making a deep copy of the PDF with all meetings when we
+ * create the additional list
+ *
+ * @var MPDF
+ */
+ private $deepCopy = null;
+ private function getDeepCopy($m)
+ {
+ if ($this->deepCopy === null) {
+ $this->deepCopy = deep_copy($m);
+ }
+ return $this->deepCopy;
+ }
/**
* Generate the meeting list itself, using the specified template and the meetings as structed by the heading manager.
*
@@ -333,7 +375,7 @@ private function writeMeetings(string $template, Bread_Meetingslist_Structure $m
* We want to check that a header and at least one meeting fits, so we write it
* to a test PDF, see how big it is, and check if it will fit.
*/
- $test_pages = deep_copy($this->mpdf);
+ $test_pages = $this->getDeepCopy($this->mpdf);
while ($subheadings = $meetingslistStructure->iterateMainHeading()) {
while ($meetings = $meetingslistStructure->iterateSubHeading($subheadings)) {
while ($meeting_value = $meetingslistStructure->iterateMeetings($meetings)) {
@@ -442,42 +484,13 @@ private function write_single_meeting(array $meeting_value, string $template, ar
'/>' .
substr($data, $qr_end + 1);
}
- $search_strings = array();
- $replacements = array();
- $clean_up = array(
- '' => '',
- ' ' => '',
- '' => '',
- ' ' => '',
- '' => '',
- ' ' => '',
- ' ' => ' ',
- ' ' => ' ',
- ' ' => ' ',
- '' => '',
- '()' => '',
- '
' => 'line_break',
- '
' => 'line_break',
- 'line_break line_break' => '
',
- 'line_breakline_break' => '
',
- 'line_break' => '
',
- '
,' => '
',
- ',
' => '
',
- ',
' => '
',
- ',' => ' ',
- ", , ," => ",",
- ", *," => ",",
- ", ," => ",",
- " , " => " ",
- ", (" => " (",
- ', ' ' $value) {
- $search_strings[] = $key;
- $replacements[] = $value;
- }
- $data = str_replace($search_strings, $replacements, $data);
+ $data = str_replace(array_keys($this->clean_up), array_values($this->clean_up), $data);
+ $data = preg_replace(array_keys($this->preg_clean_up), array_values($this->preg_clean_up), $data);
+
+ do {
+ $data = preg_replace('/,\s*(,| \(| 0);
+ $data = preg_replace('/\s+,/i', ',', $data);
return $data;
}
/**
diff --git a/public/class-bread-meeting-enhancer.php b/public/class-bread-meeting-enhancer.php
index 9518139..40029fe 100644
--- a/public/class-bread-meeting-enhancer.php
+++ b/public/class-bread-meeting-enhancer.php
@@ -24,7 +24,7 @@ public function enhance_meeting(&$meeting_value, $lang, $formatsManager, $format
{
if ($formatStartTime) {
$duration = explode(':', $meeting_value['duration_time']);
- $minutes = intval($duration[0]) * 60 + intval($duration[1]) + intval($duration[2]);
+ $minutes = intval($duration[0]) * 60 + intval($duration[1]);
$meeting_value['duration_m'] = $minutes;
$meeting_value['duration_h'] = rtrim(rtrim(number_format($minutes / 60, 2), 0), '.');
$space = ' ';
diff --git a/readme.txt b/readme.txt
index 777f2dd..afc7013 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: meeting list, bmlt, narcotics anonymous, na
Requires PHP: 8.1
Requires at least: 6.2
Tested up to: 6.9
-Stable tag: 2.9.11
+Stable tag: 2.9.12
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -55,6 +55,11 @@ Follow all these steps, keep in mind that once you start using bread, it's not g
== Changelog ==
+= 2.9.12 =
+* Cleaned up commas after blank fields
+* Updated mPDF
+* Minor Bug Fixes
+
= 2.9.11 =
* Corrected Greek Translation
|