Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bmlt-meeting-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Plugin Name: Bread
* Plugin URI: https://bmlt.app
* Description: Maintains and generates PDF Meeting Lists from BMLT.
* Version: 2.10.7
* Version: 2.10.8
* Author: bmlt-enabled
* Author URI: https://bmlt.app/
* License: GPL-2.0+
Expand Down
4 changes: 2 additions & 2 deletions public/class-bread-content-generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,9 @@ private function analyseTemplate(string $template): array
* @param array $meeting_value The meeting data.
* @param string $template
* @param array $analysedTemplate
* @return void
* @return string
*/
private function write_single_meeting(array $meeting_value, string $template, array $analysedTemplate)
private function write_single_meeting(array $meeting_value, string $template, array $analysedTemplate): string
{
$data = $template;
$namedValues = array();
Expand Down
16 changes: 8 additions & 8 deletions public/class-bread-format-manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ private function getAllFormats(string $lang): array
return $this->allFormats[$lang];
}
/**
* ULookup the format having a particular field having a particular value. Null if none found.
* Lookup the format having a particular field having a particular value. Null if none found.
*
* @param string $lang the language of the formats being searched.
* @param string $field
* @param string $id
* @return array|null
* @return array|null: the format having the specified field value, or null if none found.
*/
private function getFormatFromField(string $lang, string $field, string $id): array|null
{
Expand All @@ -128,7 +128,7 @@ private function getFormatFromField(string $lang, string $field, string $id): ar
* @param array $formats
* @param string $id
* @param string $field
* @return array|null
* @return array|null the format having the specified field value, or null if none found.
*/
private function searchField(array $formats, string $id, string $field): array|null
{
Expand Down Expand Up @@ -195,9 +195,9 @@ public function getHashedFormats(string $lang): array
* @param boolean $isAll All formats or only used.
* @param string $lineHeight
* @param string $fontSize
* @return void
* @return string
*/
public function write_detailed_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize)
public function write_detailed_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize): string
{
$formats = $isAll ? $this->allFormats[$lang] : $this->getFormatsUsed($lang);
if (empty($formats)) {
Expand All @@ -218,9 +218,9 @@ public function write_detailed_formats(string $lang, bool $isAll, string $lineHe
* @param boolean $isAll All formats or only used.
* @param string $lineHeight
* @param string $fontSize
* @return void
* @return string the HTML table of formats.
*/
public function write_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize, bool $isTwoPerRow = true)
public function write_formats(string $lang, bool $isAll, string $lineHeight, string $fontSize, bool $isTwoPerRow = true): string
{
$formats = $isAll ? $this->getAllFormats($lang) : $this->getFormatsUsed($lang);
if (empty($formats)) {
Expand All @@ -246,7 +246,7 @@ public function write_formats(string $lang, bool $isAll, string $lineHeight, str
$data .= "</table>";
return $data;
}
public function getWheelchairFormat($lang)
public function getWheelchairFormat(string $lang): array
{
if (is_array($this->wheelchairFormat) && empty($this->wheelchairFormat)) {
$this->wheelchairFormat = $this->getFormatFromField($lang, 'world_id', 'WCHR');
Expand Down
12 changes: 7 additions & 5 deletions public/class-bread-meeting-enhancer.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Bread_Meeting_Enhancer
private Bread $bread;
private array $options;
private array $areas;
function __construct($bread, $areas)
function __construct(Bread $bread, array $areas)
{
$this->bread = $bread;
$this->options = $bread->getOptions();
Expand All @@ -18,9 +18,11 @@ function __construct($bread, $areas)
*
* @param array $meeting_value the raw meeting values, as returned from the BMLT root server.
* @param string $lang The language used when generating format descriptions, etc.
* @return void
* @param Bread_FormatsManager $formatsManager The formats manager, used to look up format information.
* @param boolean $formatStartTime Whether to format the start time and duration fields.
* @return array the enhanced meeting values.
*/
public function enhance_meeting(&$meeting_value, $lang, $formatsManager, $formatStartTime = true)
public function enhance_meeting(&$meeting_value, string $lang, Bread_FormatsManager $formatsManager, bool $formatStartTime = true): array
{
if ($formatStartTime) {
$duration = explode(':', $meeting_value['duration_time']);
Expand Down Expand Up @@ -92,7 +94,7 @@ public function enhance_meeting(&$meeting_value, $lang, $formatsManager, $format
// Extensions.
return apply_filters("Bread_Enrich_Meeting_Data", $meeting_value, $formatsManager->getHashedFormats($lang));
}
private function noon($time)
private function noon(string $time): string
{
if ($time == '12:00PM' || $time == '12:00 PM') {
return 'NOON';
Expand All @@ -111,7 +113,7 @@ private function get_area_name(array $meeting_value): string
return '';
}

private function toPersianNum($number)
private function toPersianNum(string $number): string
{
$number = str_replace("1", "۱", $number);
$number = str_replace("2", "۲", $number);
Expand Down
4 changes: 2 additions & 2 deletions public/class-bread-public.php
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ private function construct_init_options(string $default_font): array

return $mpdf_init_options;
}
private function drawLinesSeperatingColumns($format, $default_font)
private function drawLinesSeperatingColumns(string $format, string $default_font)
{
$html = '<body style="background-color:#fff;">';
if ($this->options['page_fold'] == 'tri') {
Expand Down Expand Up @@ -600,7 +600,7 @@ private function reorder_booklet_pages()
];
$mpdfOptions = $this->addFontOptions($mpdfOptions);
$mpdftmp = new mPDF($mpdfOptions);
$this->mpdf->shrink_tables_to_fit = 1;
$mpdftmp->shrink_tables_to_fit = 1.01;
$np = $mpdftmp->SetSourceFile($FilePath);
$ow = $mpdftmp->w;
$oh = $mpdftmp->h;
Expand Down
1 change: 1 addition & 0 deletions public/css/mpdfstyletables.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ div {
}
table {
border-collapse: collapse;
overflow: wrap;
/*font-family: arialnarrow;*/
/* font-size: 7pt; */

Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Tags: meeting list, bmlt, narcotics anonymous, na
Requires PHP: 8.1
Requires at least: 6.2
Tested up to: 7.1
Stable tag: 2.10.7
Stable tag: 2.10.8

License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -55,6 +55,9 @@ Follow all these steps, keep in mind that once you start using bread, it's not g

== Changelog ==

= 2.10.8 =
* Never autoshrink table font-size.

= 2.10.7 =
* Allow fields added through extenstions to be used as groupings

Expand Down
Loading