Fixes #23

Author: root

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Cookbook</name>
     <summary>An integrated cookbook using schema.org JSON files as recipes</summary>
     <description><![CDATA[A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.]]></description>
-    <version>0.1.12</version>
+    <version>0.2.0</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >Jeppe Zapp</author>
     <namespace>Cookbook</namespace>

lib/Service/RecipeService.php

@@ -165,9 +165,9 @@ public function checkRecipe($json) {
             if(is_array($json['recipeInstructions'])) {
                 foreach($json['recipeInstructions'] as $i => $step) {
                     if(is_string($step)) {
-                        $json['recipeInstructions'][$i] = $this->cleanUpString($step);
+                        $json['recipeInstructions'][$i] = $this->cleanUpString($step, true);
                     } else if(is_array($step) && isset($step['text'])) {
-                        $json['recipeInstructions'][$i] = $this->cleanUpString($step['text']);
+                        $json['recipeInstructions'][$i] = $this->cleanUpString($step['text'], true);
                     } else {
                         $json['recipeInstructions'][$i] = '';
                     }
@@ -704,11 +704,17 @@ private function isRecipeFile($file) {
      *
      * @return string
      */  
-    private function cleanUpString($str) {
+    private function cleanUpString($str, $preserve_newlines = false) {
         if(!$str) { return ''; }
 
         $str = strip_tags($str);
-        $str = str_replace(["\r", "\n", "\t", "\\"], '', $str);
+
+        if(!$preserve_newlines) {
+            $str = str_replace(["\r", "\n"], '', $str);
+        }
+        
+        $str = str_replace(["\t", "\\"], '', $str);
+
         $str = html_entity_decode($str);
 
         return $str;

templates/content/recipe.php

@@ -6,46 +6,31 @@
     <?php } ?>
 
     <h2><?php echo $_['name']; ?></h2>
-
+    
     <div class="recipe-details">
+        <?php if(isset($_['url']) && $_['url']) { ?>
+            <p><strong><?php p($l->t('Source')); ?>: </strong><a target="_blank" href="<?php echo $_['url']; ?>"><?php echo $_['url']; ?></a></p>
+        <?php } ?>
+
         <p><?php echo $_['description']; ?></p>
 
         <?php if(isset($_['prepTime']) && $_['prepTime']) {
             $prep_interval = new DateInterval($_['prepTime']);
             $prep_mins = $prep_interval->format('%i');
             $prep_hours = $prep_interval->format('%h');
-            if($prep_hours > 0) {
-                $prep_hour_string = $prep_hours.' '.($prep_hours > 1 ? 'Hours' : 'Hour').' ';
-            } else {
-                $prep_hour_string = "";
-            }
-            if($prep_mins > 0) {
-                $prep_min_string = $prep_mins.' '.($prep_mins > 1 ? 'Mins' : 'Min');
-            } else {
-                $prep_min_string = "";
-            }
-            ?>
-            <p><strong>Prep: </strong><?php echo $prep_hour_string.$prep_min_string; ?></p>
+        ?>
+            <p><strong><?php p($l->t('Preparation time')); ?>: </strong><?php echo $prep_hours . ':' . $prep_mins; ?></p>
         <?php } ?>
+
         <?php if(isset($_['cookTime']) && $_['cookTime']) {
             $cook_interval = new DateInterval($_['cookTime']);
             $cook_mins = $cook_interval->format('%i');
             $cook_hours = $cook_interval->format('%h');
-            if($cook_hours > 0) {
-                $cook_hour_string = $cook_hours.' '.($cook_hours > 1 ? 'Hours' : 'Hour').' ';
-            } else {
-                $cook_hour_string = "";
-            }
-            if($cook_mins > 0) {
-                $cook_min_string = $cook_mins.' '.($cook_mins > 1 ? 'Mins' : 'Min');
-            } else {
-                $cook_min_string = "";
-            }
-            ?>
-            <p><strong>Cook: </strong><?php echo $cook_hour_string.$cook_min_string; ?></p>
+        ?>
+            <p><strong><?php p($l->t('Cooking time')); ?>: </strong><?php echo $cook_hours . ':' . $cook_mins; ?></p>
         <?php } ?>
 
-        <p><?php p($l->n('One serving', '%n servings', $_['recipeYield'])); ?></p>
+        <p><strong><?php p($l->t('Servings')); ?>: </strong><?php echo $_['recipeYield']; ?></p>
     </div>
 
     <?php if(isset($_['dailyDozen'])) { ?>
@@ -89,13 +74,8 @@
         <h3><?php p($l->t('Instructions')); ?></h3>
 
         <?php foreach($_['recipeInstructions'] as $step) {  ?>
-            <li><?php echo $step; ?></li>   
+            <li><?php echo nl2br($step); ?></li>   
         <?php } ?>
     </ul>
 </main>
 
-
-<?php if(isset($_['url']) && $_['url']) { ?>
-    <p><a href="<?php echo $_['url']; ?>">Original Source</a></p>
-<?php } ?>
-