Skip to content

Issue #262 #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrzapp merged 3 commits into from
Jun 25, 2020
Merged

Issue #262 #272

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f1a55d
added preserve_slashes functionality to cleanUpString, so we may have…
Jun 19, 2020
7ef2c30
formatting, issue # 262
Jun 19, 2020
64e6fb7
strip of slashes as an option, using for names only
Jun 23, 2020
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
16 changes: 11 additions & 5 deletions lib/Service/RecipeService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public function checkRecipe(array $json): array
$json['@type'] = 'Recipe';

// Make sure that "name" doesn't have any funky characters in it
$json['name'] = $this->cleanUpString($json['name']);
$json['name'] = $this->cleanUpString($json['name'], false, true);

// Make sure that "image" is a string of the highest resolution image available
if (isset($json['image']) && $json['image']) {
Expand Down Expand Up @@ -275,7 +275,7 @@ public function checkRecipe(array $json): array
$ingredients = [];

foreach ($json['recipeIngredient'] as $i => $ingredient) {
$ingredient = $this->cleanUpString($ingredient);
$ingredient = $this->cleanUpString($ingredient, false);

if (!$ingredient) {
continue;
Expand Down Expand Up @@ -1142,7 +1142,7 @@ private function isRecipeFile($file)
*
* @return string
*/
private function cleanUpString($str, $preserve_newlines = false)
private function cleanUpString($str, $preserve_newlines = false, $remove_slashes = false)
{
if (!$str) {
return '';
Expand All @@ -1154,8 +1154,14 @@ private function cleanUpString($str, $preserve_newlines = false)
$str = str_replace(["\r", "\n"], '', $str);
}

$str = str_replace(["\t", "\\", "/"], '', $str);

//We want to remove forward-slashes for the name of the recipe, to tie it to the directory structure, which cannot have slashes
if ($remove_slashes) {
$str = str_replace(["\t", "\\", "/"], '', $str);
}
else {
$str = str_replace(["\t", "\\"], '', $str);
}

$str = html_entity_decode($str);

return $str;
Expand Down