Index: recipe.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/recipe/recipe.install,v retrieving revision 1.10 diff -u -r1.10 recipe.install --- recipe.install 20 Apr 2008 19:05:12 -0000 1.10 +++ recipe.install 28 Dec 2009 22:06:56 -0000 @@ -1,111 +1,141 @@ array( 'nid' => array( - 'description' => t('The primary identifier for a recipe.'), + 'description' => 'The primary identifier for a recipe.', 'type' => 'serial', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), 'source' => array( 'type' => 'varchar', 'not null' => FALSE, - 'length' => 255), + 'length' => 255, + ), 'yield' => array( 'type' => 'int', 'unsigned' => FALSE, - 'not null' => TRUE), + 'not null' => TRUE, + ), 'instructions' => array( - 'type' => 'text'), + 'type' => 'text', + ), 'notes' => array( - 'type' => 'text'), + 'type' => 'text', + ), 'preptime' => array( 'type' => 'int', 'unsigned' => TRUE, - 'default' => 0), + 'default' => 0, + ), ), 'primary key' => array('nid'), ); + $schema['recipe_node_ingredient'] = array( - 'description' => t('The base table for recipe ingredients.'), + 'description' => 'The base table for recipe ingredients.', 'fields' => array( 'id' => array( - 'description' => t('The primary identifier for a recipe ingredient.'), + 'description' => 'The primary identifier for a recipe ingredient.', 'type' => 'serial', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), 'nid' => array( 'type' => 'int', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), 'unit_id' => array( 'type' => 'int', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), 'quantity' => array( 'type' => 'float', - 'not null' => FALSE), + 'not null' => FALSE, + ), 'ingredient_id' => array( 'type' => 'int', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), ), 'primary key' => array('id'), ); + $schema['recipe_ingredient'] = array( - 'description' => t('The base table for recipe ingredients.'), + 'description' => 'The base table for recipe ingredients.', 'fields' => array( 'id' => array( - 'description' => t('The primary identifier for a recipe ingredient.'), + 'description' => 'The primary identifier for a recipe ingredient.', 'type' => 'serial', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), 'name' => array( 'type' => 'varchar', - 'length' => 255), + 'length' => 255, + ), 'link' => array( 'type' => 'int', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), ), 'primary key' => array('id'), ); + $schema['recipe_unit'] = array( - 'description' => t('The base table for recipe units.'), + 'description' => 'The base table for recipe units.', 'fields' => array( 'id' => array( 'type' => 'serial', 'unsigned' => TRUE, - 'not null' => TRUE), + 'not null' => TRUE, + ), 'name' => array( 'type' => 'varchar', - 'length' => 255), + 'length' => 255, + ), 'abbreviation' => array( 'type' => 'varchar', - 'length' => 8), + 'length' => 8, + ), 'metric' => array( 'type' => 'int', 'not null' => TRUE, 'unsigned' => TRUE, - 'default' => 0), + 'default' => 0, + ), 'type' => array( 'type' => 'varchar', 'length' => 6, 'not null' => TRUE, - 'default' => 'Mass'), + 'default' => 'Mass', + ), ), 'primary key' => array('id'), ); return $schema; } + function recipe_install() { drupal_install_schema('recipe'); recipe_populate_units(); } function recipe_populate_units() { - $s = true; + $s = TRUE; $s = $s && db_query("INSERT INTO {recipe_unit} VALUES (1, 'Slice', 'sli', 0, 'Unit');"); $s = $s && db_query("INSERT INTO {recipe_unit} VALUES (2, 'Unit', '', 0, 'Unit');"); $s = $s && db_query("INSERT INTO {recipe_unit} VALUES (3, 'Clove', 'clv', 0, 'Unit');"); Index: recipe.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/recipe/recipe.css,v retrieving revision 1.3 diff -u -r1.3 recipe.css --- recipe.css 13 Sep 2006 08:02:53 -0000 1.3 +++ recipe.css 28 Dec 2009 22:06:56 -0000 @@ -1,8 +1,37 @@ -.recipe-summary { float: right; margin: 0 0 1em 1em; } -.recipe-summary table { border-collapse: collapse; } -.recipe-summary td, .recipe-summary th { border: 1px solid #aaa; padding: .2em; } -.recipe-summary th { background: #eee; } -.recipe-ingredients acronym { border-bottom: 1px dotted #333; cursor: help; } -#recipe_custom_yield fieldset .form-item { display: inline; } -#recipe_custom_yield fieldset .form-submit { display: inline; } -#recipe_custom_yield fieldset { border: none; } +/* $Id: $ */ + +.recipe-summary { + float: right; + margin: 0 0 1em 1em; +} + +.recipe-summary table { + border-collapse: collapse; +} + +.recipe-summary td, +.recipe-summary th { + border: 1px solid #aaa; + padding: .2em; +} + +.recipe-summary th { + background: #eee; +} + +.recipe-ingredients acronym { + border-bottom: 1px dotted #333; + cursor: help; +} + +#recipe_custom_yield fieldset .form-item { + display: inline; +} + +#recipe_custom_yield fieldset .form-submit { + display: inline; +} + +#recipe_custom_yield fieldset { + border: none; +} Index: recipe.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/recipe/recipe.module,v retrieving revision 1.82.2.2 diff -u -r1.82.2.2 recipe.module --- recipe.module 26 Jun 2009 12:46:26 -0000 1.82.2.2 +++ recipe.module 28 Dec 2009 22:06:57 -0000 @@ -15,14 +15,14 @@ * Implementation of hook_perm(). */ function recipe_perm() { - return array(t('create recipes'), t('edit own recipes')); + return array('create recipes', 'edit own recipes'); } /** * Implementation of hook_load(). */ function recipe_load($node) { - $recipe = db_fetch_object(db_query('SELECT * FROM {recipe} WHERE nid = %d', $node->nid)); + $recipe = db_fetch_object(db_query("SELECT * FROM {recipe} WHERE nid = %d", $node->nid)); $recipe->ingredients = recipe_load_ingredients($node); return $recipe; } @@ -64,7 +64,7 @@ 'recipe' => array( 'name' => t('Recipe'), 'module' => 'recipe', - 'description' => t("Share your favorite recipes with your fellow cooks."), + 'description' => t('Share your favorite recipes with your fellow cooks.'), ) ); } @@ -75,7 +75,7 @@ function recipe_help($path, $arg) { switch ($path) { case 'node/add/recipe': - return variable_get("recipe_help", ""); + return variable_get('recipe_help', ''); } } @@ -86,7 +86,7 @@ * database inserts. */ function recipe_insert($node) { - db_query("INSERT INTO {recipe} (nid, source, yield, notes, instructions, preptime) VALUES (%d, '%s', '%s', '%s', '%s', '%d')", $node->nid, $node->source, $node->yield, $node->notes, $node->instructions, $node->preptime); + db_query("INSERT INTO {recipe} (nid, source, yield, notes, instructions, preptime) VALUES (%d, '%s', '%s', '%s', '%s', %d)", $node->nid, $node->source, $node->yield, $node->notes, $node->instructions, $node->preptime); recipe_save_ingredients($node); } @@ -97,7 +97,7 @@ * database updates. */ function recipe_update($node) { - db_query("UPDATE {recipe} SET source = '%s', yield = '%s', notes = '%s', instructions = '%s', preptime = '%d' WHERE nid = %d", $node->source, $node->yield, $node->notes, $node->instructions, $node->preptime, $node->nid); + db_query("UPDATE {recipe} SET source = '%s', yield = '%s', notes = '%s', instructions = '%s', preptime = %d WHERE nid = %d", $node->source, $node->yield, $node->notes, $node->instructions, $node->preptime, $node->nid); recipe_save_ingredients($node); } @@ -114,11 +114,16 @@ /** * Implementation of hook_form(). */ -function recipe_form(&$node,$form_state) { +function recipe_form(&$node, $form_state) { // drupal 4.7 requires the title field to be defined by the custom node's module - $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), - '#size' => 60, '#maxlength' => 128, '#required' => TRUE, - '#default_value' => $node->title); + $form['title'] = array( + '#type' => 'textfield', + '#title' => t('Title'), + '#size' => 60, + '#maxlength' => 128, + '#required' => TRUE, + '#default_value' => $node->title, + ); // Now we define the form elements specific to our node type. $form['body'] = array( @@ -142,18 +147,34 @@ ); $form['preptime'] = array( '#type' => 'select', - '#title' => t("Preparation time"), + '#title' => t('Preparation time'), '#default_value' => $node->preptime, - '#options' => array(5 => t('5 minutes'), 10 => t('10 minutes'), 15 => t('15 minutes'), 20 => t('20 minutes'), 30 => t('30 minutes'), 45 => t('45 minutes'), 60 => t('1 hour'), 90 => t('1 1/2 hours'), 120 => t('2 hours'), 150 => t('2 1/2 hours'), 180 => t('3 hours'), 210 => t('3 1/2 hours'), 240 => t('4 hours'), 300 => t('5 hours'), 360 => t('6 hours')), - '#description' => t("How long does this recipe take to prepare (i.e. elapsed time)"), + '#options' => array( + 5 => t('5 minutes'), + 10 => t('10 minutes'), + 15 => t('15 minutes'), + 20 => t('20 minutes'), + 30 => t('30 minutes'), + 45 => t('45 minutes'), + 60 => t('1 hour'), + 90 => t('1 1/2 hours'), + 120 => t('2 hours'), + 150 => t('2 1/2 hours'), + 180 => t('3 hours'), + 210 => t('3 1/2 hours'), + 240 => t('4 hours'), + 300 => t('5 hours'), + 360 => t('6 hours'), + ), + '#description' => t('How long does this recipe take to prepare (i.e. elapsed time)'), ); $form["source"] = array( '#type' => 'textfield', - '#title' => t("Source"), + '#title' => t('Source'), '#default_value' => $node->source, '#size' => 60, '#maxlength' => 127, - '#description' => t("Optional. Does anyone else deserve credit for this recipe?"), + '#description' => t('Optional. Does anyone else deserve credit for this recipe?'), ); // Table of existing ingredients @@ -162,7 +183,7 @@ if ($system == 'complex') { $form['ingredients']['headings'] = array( '#value' => '
'."\n".'', ); } @@ -179,10 +200,11 @@ $num_ingredients = $id+1; if ($id == 0) { $j = '0'; - } else { + } + else { $j = $id; } - + // For preview, node->ingredients is an array, for actual display, it's an object $name = ''; $unit_id = ''; @@ -193,22 +215,24 @@ $unit_id = $ingredient['unit_id']; $abbreviation = $ingredient['abbreviation']; $quantity = $ingredient['quantity']; - } else { + } + else { $name = $ingredient->name; $unit_id = $ingredient->unit_id; $abbreviation = $ingredient->abbreviation; $quantity = $ingredient->quantity; - } + } if ($name && isset($quantity)) { // When can the following statement be true? if (!$ingredient) { - drupal_set_message(t('Recipe Module: An error has occured. Please report this error to the system administrator.'), 'error'); + drupal_set_message(t('Recipe module: An error has occurred. Please report this error to the system administrator.'), 'error'); if (is_array($ingredient)) { $ingredient['quantity'] = ''; $ingredient['unit_id'] = 21; $ingredient['name'] = ''; - } else { + } + else { $ingredient->quantity = ''; $ingredient->unit_id = 21; $ingredient->name = ''; @@ -281,6 +305,7 @@ } // if ($ingredient->name && isset($ingredient->quantity)) } // foreach ($node->ingredients as $id => $ingredient) } // if ($node->ingredients) + // Add ten more spots for ingredients than are already used for ($i = $num_ingredients; $i < $num_ingredients+10; $i++) { if ($i == 0) { @@ -339,7 +364,7 @@ } } $form['ingredients']['end'] = array( - '#value' => ''."\n".'
'. t('Quantity') .''. - t('Units') .''. t('Ingredient Name') . + t('Units') .''. t('Ingredient name') . '
'."\n", + '#value' => '' . "\n" . '' . "\n", ); $form['instructions'] = array( @@ -352,11 +377,11 @@ ); $form['notes'] = array( '#type' => 'textarea', - '#title' => t("Additional Notes"), + '#title' => t('Additional notes'), '#default_value' => $node->notes, '#cols' => 60, '#rows' => 5, - '#description' => t("Optional. Describe a great dining experience relating to this recipe, or note which wine or other dishes complement this recipe"), + '#description' => t('Optional. Describe a great dining experience relating to this recipe, or note which wine or other dishes complement this recipe.'), ); $form['filter'] = filter_form($node->format); @@ -369,33 +394,33 @@ function recipe_admin_settings() { $form['recipe_index_depth'] = array( '#type' => 'select', - '#title' => t('Index Depth'), + '#title' => t('Index depth'), '#default_value' => variable_get('recipe_index_depth', 0), - '#options' => array(0 => t('All Terms'), 1 => "1", 2 => "2", 3 => "3", 4 => "4", 5 => "5", 6 => "6"), - '#description' => t("Defines how many levels of terms should be displayed on any given recipe index page. For example, if you select 1 then only one level of the Recipe index tree will be displayed at a time."), + '#options' => array(0 => t('All Terms') + drupal_map_assoc(array(1, 2, 3, 4, 5, 6))), + '#description' => t('Defines how many levels of terms should be displayed on any given recipe index page. For example, if you select 1 then only one level of the recipe index tree will be displayed at a time.'), ); $form['recipe_recent_box_enable'] = array( '#type' => 'radios', - '#title' => t('Recent Recipes Box'), + '#title' => t('Recent recipes box'), '#default_value' => variable_get('recipe_recent_box_enable', 1), '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enables or Disables the recent recipes box on the recipes index page.'), - '#required' => false, + '#description' => t('Enables or disables the recent recipes box on the recipes index page.'), + '#required' => FALSE, ); $form['recipe_recent_box_title'] = array( '#type' => 'textfield', - '#title' => t('Box Title'), - '#default_value' => variable_get('recipe_recent_box_title', t('Latest Recipes')), + '#title' => t('Box title'), + '#default_value' => variable_get('recipe_recent_box_title', t('Latest recipes')), '#size' => 35, '#maxlength' => 255, - '#description' => t('Title of the Recent Recipes Box on the Recipes index page.'), + '#description' => t('Title of the recent recipes box on the recipes index page.'), ); $form['recipe_recent_display'] = array( '#type' => 'select', - '#title' => t('Recipes to Display'), - '#default_value' => variable_get('recipe_recent_display', '5'), - '#options' => array(5 => "5", 10 => "10", 15 => "15"), - '#description' => t("Sets the number of recent recipes that will be displayed in the Recent Recipes box. (0 = not displayed)."), + '#title' => t('Recipes to display'), + '#default_value' => variable_get('recipe_recent_display', 5), + '#options' => drupal_map_assoc(array(0, 5, 10, 15)), + '#description' => t('Sets the number of recent recipes that will be displayed in the Recent Recipes box. (0 = not displayed).'), ); $form['recipe_help'] = array( '#type' => 'textarea', @@ -403,39 +428,42 @@ '#default_value' => variable_get('recipe_help', ''), '#cols' => 55, '#rows' => 4, - '#description' => t('This text will be displayed at the top of the recipe submission form. Useful for helping or instructing your users.'), + '#description' => t('This text will be displayed at the top of the recipe submission form. Useful for helping or instructing your users.'), ); - $options = array('simple' => t('Simple'), 'complex' => t('Complex')); + $form['recipe_ingredient_system'] = array( '#type' => 'radios', '#title' => t('Ingredient entering system'), '#default_value' => variable_get('recipe_ingredient_system', 'complex'), - '#options' => $options, - '#description' => t('The simple ingredient system allows all ingredients to be entered on one line. The complex system forces the user to seperate the quanity and units from the ingredient'), + '#options' => array( + 'simple' => t('Simple'), + 'complex' => t('Complex'), + ), + '#description' => t('The simple ingredient system allows all ingredients to be entered on one line. The complex system forces the user to separate the quantity and units from the ingredient.'), ); $form['recipe_fraction_display'] = array( '#type' => 'textfield', - '#title' => t('Fractions Display String'), + '#title' => t('Fractions display string'), '#default_value' => variable_get('recipe_fraction_display', t('{%d }%d⁄%d')), '#size' => 35, '#maxlength' => 255, - '#description' => t('How fractions should be displayed. Leave blank to display as decimals. Each incidence of %d will be replaced by the whole number, the numerator, and the denominator in that order. Anything between curly braces will not be displayed when the whole number is equal to 0. Recommended settings are "{%d }%d&frasl;%d" or "{%d }<sup>%d</sup>/<sub>%d</sub>"'), + '#description' => t('How fractions should be displayed. Leave blank to display as decimals. Each incidence of %d will be replaced by the whole number, the numerator, and the denominator in that order. Anything between curly braces will not be displayed when the whole number is equal to 0. Recommended settings are "{%d }%d&frasl;%d" or "{%d }<sup>%d</sup>/<sub>%d</sub>"'), ); $form['recipe_export_html_enable'] = array( '#type' => 'radios', - '#title' => t('Export HTML'), + '#title' => t('Export to HTML'), '#default_value' => variable_get('recipe_export_html_enable', 1), '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enables or Disables the Export as HTML link.'), - '#required' => false, + '#description' => t('Enables or disables the Export as HTML link.'), + '#required' => FALSE, ); $form['recipe_export_recipeml_enable'] = array( '#type' => 'radios', - '#title' => t('Export RecipeML'), + '#title' => t('Export to RecipeML'), '#default_value' => variable_get('recipe_export_recipeml_enable', 1), '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t('Enables or Disables the Export as RecipeML link.'), - '#required' => false, + '#description' => t('Enables or disables the Export as RecipeML link.'), + '#required' => FALSE, ); return system_settings_form($form); } @@ -446,32 +474,32 @@ * Note: when editing this function you must visit 'admin/menu' to reset the cache */ function recipe_menu() { - $items = array(); - $items['recipe'] = array( - 'title' => t('Recipes'), - 'page callback' => 'recipe_page', - 'access arguments' => array('access content'), - 'type' => MENU_SUGGESTED_ITEM - ); - $items['recipe/ingredient/autocomplete'] = array( - 'title' => t('Ingredient autocomplete'), - 'page callback' => 'recipe_autocomplete_page', - 'type' => MENU_CALLBACK, - 'access arguments' => array('access content') - ); - $items['recipe/export'] = array( - 'page callback' => 'recipe_export', - 'type' => MENU_CALLBACK, - 'access arguments' => array('access content') - ); - $items['admin/settings/recipe'] = array( - 'title' => t('Recipe module'), - 'description' => t('Settings that control how the recipe module functions.'), - 'page callback' => 'drupal_get_form', - 'page arguments' => array('recipe_admin_settings'), - 'access arguments' => array('administer site configuration'), - 'type' => MENU_NORMAL_ITEM, - ); + $items['recipe'] = array( + 'title' => 'Recipes', + 'page callback' => 'recipe_page', + 'access arguments' => array('access content'), + 'type' => MENU_SUGGESTED_ITEM, + ); + $items['recipe/ingredient/autocomplete'] = array( + 'title' => 'Ingredient autocomplete', + 'page callback' => 'recipe_autocomplete_page', + 'type' => MENU_CALLBACK, + 'access arguments' => array('access content'), + ); + $items['recipe/export'] = array( + 'page callback' => 'recipe_export', + 'type' => MENU_CALLBACK, + 'access arguments' => array('access content'), + ); + $items['admin/settings/recipe'] = array( + 'title' => 'Recipe module', + 'description' => 'Settings that control how the recipe module functions.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('recipe_admin_settings'), + 'access arguments' => array('administer site configuration'), + 'type' => MENU_NORMAL_ITEM, + ); + return $items; } @@ -507,6 +535,7 @@ // end users will not see these descriptions. $blocks[0]['info'] = t('Newest recipes'); return $blocks; + case 'view': // If $op is "view", then we need to generate the block for display // purposes. The $delta parameter tells us which block is being requested. @@ -549,21 +578,24 @@ function recipe_unit_options() { static $options; static $unit_rs; - if ( !isset( $unit_rs ) ) { - $unit_rs = db_query('SELECT id,type,name,abbreviation FROM {recipe_unit} ORDER BY type ASC, metric'); + + if (!isset($unit_rs)) { + $unit_rs = db_query("SELECT id, type, name, abbreviation FROM {recipe_unit} ORDER BY type ASC, metric"); $options = array(); + while ($r = db_fetch_object($unit_rs)) { if (isset($r->type)) { - if (!isset($options[$r->type])) { - $options[$r->type] = array(); - } - $options[$r->type][$r->id] = $r->name .' ('. $r->abbreviation .')'; + if (!isset($options[$r->type])) { + $options[$r->type] = array(); + } + $options[$r->type][$r->id] = t('@name (@abbreviation)', array('@name' => $r->name, '@abbreviation' => $r->abbreviation)); } else { - $options[$r->id] = $r->name .' ('. $r->abbreviation .')'; + $options[$r->id] = t('@name (@abbreviation)', array('@name' => $r->name, '@abbreviation' => $r->abbreviation)); } } } + return $options; } @@ -578,7 +610,7 @@ if (!$ingredient_id) { global $active_db; - $node_link = db_result(db_query("SELECT nid FROM {node} n WHERE title = '%s'", $name)); + $node_link = db_result(db_query("SELECT nid FROM {node} WHERE title = '%s'", $name)); db_query("INSERT INTO {recipe_ingredient} (name, link) VALUES ('%s', '%s')", $name, $node_link); $ingredient_id = db_result(db_query("SELECT id FROM {recipe_ingredient} WHERE LOWER(name)='%s'", trim(strtolower($name)))); @@ -604,8 +636,9 @@ } else { $sign = 1; - if ($decimal < 0) + if ($decimal < 0) { $sign = -1; + } } if (floor(abs($decimal)) == 0) { @@ -629,24 +662,24 @@ } } - // workaround for thirds, sixths, ninths, twelfths + // Workaround for thirds, sixths, ninths, twelfths. $overrides = array( - '3333' => array(1, 3), '6666' => array(2, 3), '9999' => array(3, 3), // thirds - '1666' => array(1, 6), '8333' => array(5, 6), // sixths - '1111' => array(1, 9), '2222' => array(2, 9), '4444' => array(4, 9), '5555' => array(5, 9), '7777' => array(7, 9), '8888' => array(8, 9), // ninths - '0833' => array(1, 12), '4166' => array(5, 12), '5833' => array(7, 12), '9166' => array(11, 12), // twelfths + '3333' => array(1, 3), '6666' => array(2, 3), '9999' => array(3, 3), // thirds + '1666' => array(1, 6), '8333' => array(5, 6), // sixths + '1111' => array(1, 9), '2222' => array(2, 9), '4444' => array(4, 9), '5555' => array(5, 9), '7777' => array(7, 9), '8888' => array(8, 9), // ninths + '0833' => array(1, 12), '4166' => array(5, 12), '5833' => array(7, 12), '9166' => array(11, 12), // twelfths ); $conversionstr = substr((string) ($conversion - floor($conversion)), 2, 4); if (array_key_exists($conversionstr, $overrides)) { - if ($overrides[$conversionstr][0] == $overrides[$conversionstr][1]) { - return ($whole + 1) * $sign; - } - $denominator = $overrides[$conversionstr][1]; - $numerator = (floor($conversion) * $denominator) + $overrides[$conversionstr][0]; + if ($overrides[$conversionstr][0] == $overrides[$conversionstr][1]) { + return ($whole + 1) * $sign; + } + $denominator = $overrides[$conversionstr][1]; + $numerator = (floor($conversion) * $denominator) + $overrides[$conversionstr][0]; } else { - $numerator = $conversion * $power; - $denominator = $power; + $numerator = $conversion * $power; + $denominator = $power; } $hcf = recipe_euclid($numerator, $denominator); @@ -659,17 +692,17 @@ $numerator = abs($top_heavy) - (abs($whole) * $denominator); if (($whole == 0) && ($sign == -1)) { - $numerator = $numerator * $sign; + $numerator = $numerator * $sign; } $ingredient_quantity = sprintf(variable_get('recipe_fraction_display', t('{%d} %d⁄%d')), $whole, $numerator, $denominator); - if ( ($whole == 0) && (strpos($ingredient_quantity, '{') >= 0) ) { - /* remove anything in curly braces */ + if (($whole == 0) && (strpos($ingredient_quantity, '{') >= 0)) { + // Remove anything in curly braces. $ingredient_quantity = preg_replace('/{.*}/', '', $ingredient_quantity); } else { - /* remove just the curly braces, but keep everything between them */ + // Remove just the curly braces, but keep everything between them. $ingredient_quantity = preg_replace('/{|}/', '', $ingredient_quantity); } } @@ -678,19 +711,21 @@ } /** - * Converts an ingredient's quantity from fractions to decimal + * Converts an ingredient's quantity from fractions to decimal. */ function recipe_ingredient_quantity_from_fraction($ingredient_quantity) { if ($pos_slash = strpos($ingredient_quantity, '/')) { $pos_space = strpos($ingredient_quantity, ' '); - // can't trust $pos_space to be a zero value if there is no space - // so set it explicitly - if ($pos_space === false) + + // Can't trust $pos_space to be a zero value if there is no space + // so set it explicitly. + if ($pos_space === FALSE) { $pos_space = 0; + } $whole = substr($ingredient_quantity, 0, $pos_space); $numerator = substr($ingredient_quantity, $pos_space, $pos_slash); - $denominator = substr($ingredient_quantity, $pos_slash+1); + $denominator = substr($ingredient_quantity, $pos_slash + 1); $ingredient_quantity = $whole+($numerator/$denominator); } @@ -708,25 +743,24 @@ $changes = recipe_ingredients_diff($node->ingredients, recipe_load_ingredients($node)); if (count($changes->remove) > 0) { - $ids = implode(',', $changes->remove); - db_query("DELETE FROM {recipe_node_ingredient} WHERE id IN (%s)", $ids); + db_query("DELETE FROM {recipe_node_ingredient} WHERE id IN (" . db_placeholders($changes->remove, 'int') . ")", $changes->remove); } foreach ($changes->add as $ingredient) { $ingredient->id = recipe_ingredient_id_from_name($ingredient->name); $ingredient->quantity = recipe_ingredient_quantity_from_fraction($ingredient->quantity); - db_query("INSERT INTO {recipe_node_ingredient} (nid,ingredient_id,quantity,unit_id) VALUES (%d,%d,%f,%d)", $node->nid, $ingredient->id, $ingredient->quantity, $ingredient->unit_id); + db_query("INSERT INTO {recipe_node_ingredient} (nid, ingredient_id, quantity, unit_id) VALUES (%d, %d, %f, %d)", $node->nid, $ingredient->id, $ingredient->quantity, $ingredient->unit_id); } foreach ($changes->update as $ingredient) { $ingredient->id = recipe_ingredient_id_from_name($ingredient->name); $ingredient->quantity = recipe_ingredient_quantity_from_fraction($ingredient->quantity); - db_query("UPDATE {recipe_node_ingredient} SET quantity='%f', unit_id='%d' WHERE nid='%d' AND ingredient_id='%d'", $ingredient->quantity, $ingredient->unit_id, $node->nid, $ingredient->id); + db_query("UPDATE {recipe_node_ingredient} SET quantity = %f, unit_id = %d WHERE nid = %d AND ingredient_id = %d", $ingredient->quantity, $ingredient->unit_id, $node->nid, $ingredient->id); } } /** - * Compares two arrays of ingredients and returns the differences + * Compares two arrays of ingredients and returns the differences. */ function recipe_ingredients_diff($a1, $a2) { $return->add = array(); @@ -739,25 +773,28 @@ if ($pl->name) { if (!_in_array($pl, $return->add)) { // Duplicate entries for the same ingredient are ignored. - if (!_in_array($pl, $a2)) + if (!_in_array($pl, $a2)) { $return->add[] = $pl; - else - if (!_in_array($pl, $return->update)) - $return->update[] = $pl; + } + elseif (!_in_array($pl, $return->update)) { + $return->update[] = $pl; + } } } } + foreach ($a2 as $k => $pl) { if (!_in_array($pl, $a1)) { $return->remove[] = $pl->id; } } + return $return; } /** - * Custom in_array() function because PHP 4 in_aray() doesnt seem to - * handle the first arguement being an object + * Custom in_array() function because PHP 4 in_array() does not seem to + * handle the first argument being an object. */ function _in_array($a, $b) { $a->name = trim(strtolower($a->name)); @@ -769,17 +806,18 @@ else { $compareto = trim(strtolower($row->name)); } - if ($a->name === $compareto) - return true; + if ($a->name === $compareto) { + return TRUE; + } } - return false; + return FALSE; } /** * Loads the ingredients for a recipe */ function recipe_load_ingredients($node) { - $rs = db_query(' + $rs = db_query(" SELECT ri.id, i.name, @@ -795,13 +833,15 @@ WHERE ri.ingredient_id = i.id AND ri.unit_id = u.id - AND ri.nid=%d + AND ri.nid = %d ORDER BY - ri.id', $node->nid); + ri.id", $node->nid); + $ingredients = array(); while ($ingredient = db_fetch_object($rs)) { $ingredients[] = $ingredient; } + return $ingredients; } @@ -812,7 +852,7 @@ static $abbreviations; if (!$abbreviations) { - $rs = db_query('SELECT id,abbreviation FROM {recipe_unit}'); + $rs = db_query("SELECT id, abbreviation FROM {recipe_unit}"); while ($unit = db_fetch_object($rs)) { $abbreviations[$unit->id] = $unit->abbreviation; } @@ -827,7 +867,7 @@ static $unit_names; if (!$unit_names) { - $rs = db_query('SELECT id,name FROM {recipe_unit}'); + $rs = db_query("SELECT id, name FROM {recipe_unit}"); while ($unit = db_fetch_object($rs)) { $unit_names[$unit->id] = $unit->name; } @@ -847,7 +887,7 @@ * * @param type * - a string encoding the type of output requested. - * The following types are currently supported in recipe module + * The following types are currently supported in recipe module * html: HTML (printer friendly output) * recipeml: XML (RecipeML formatted output) * Other types can be supported with contributed modules. @@ -872,9 +912,9 @@ * This function is called by recipe_export() to generate HTML for export. * * @param nid - * - an integer representing the node id (nid) of the node to export + * - An integer representing the node id (nid) of the node to export. * @return - * - string containing HTML representing the recipe + * - String containing HTML representing the recipe. */ function recipe_export_html($nid) { if ($nid == 0) { @@ -886,6 +926,7 @@ $output = theme('recipe_node', $node, FALSE); $html = theme('recipe_export_html', check_plain($node->title), $output); + return $html; } @@ -893,9 +934,9 @@ * This function is called by recipe_export() to generate RecipeML for export. * * @param nid - * - an integer representing the node id (nid) of the node to export + * - An integer representing the node id (nid) of the node to export. * @return - * - string containing the recipe in RecipeML + * - String containing the recipe in RecipeML. */ function recipe_export_recipeml($nid) { if ($nid == 0) { @@ -956,7 +997,7 @@ $ingredient = recipe_parse_ingredient_string($ingredient->name); } if ($ingredient->name && _in_array($ingredient, $ingredients)) { - form_set_error("recipe", t('Duplicate ingredients are not allowed.')); + form_set_error('recipe', t('Duplicate ingredients are not allowed.')); } else { $ingredients[] = $ingredient; @@ -966,7 +1007,7 @@ } /** - * Converts an ingredients name string to an ingredient object + * Converts an ingredients name string to an ingredient object. */ function recipe_parse_ingredient_string($ingredient_string) { if (preg_match('#([0-9.]+(?:\s?\d*/\d*)?\s?)?(?:([a-zA-Z.]*)\s)?(.*)#', trim($ingredient_string), $matches)) { @@ -993,7 +1034,7 @@ return $ingredient; } else { - return false; + return FALSE; } } @@ -1017,7 +1058,7 @@ static $units_array; if (!$units_array) { - $rs = db_query('SELECT id,name,abbreviation FROM {recipe_unit}'); + $rs = db_query("SELECT id, name, abbreviation FROM {recipe_unit}"); while ($unit = db_fetch_object($rs)) { $units_array[strtolower($unit->name)] = $unit; $units_array[$unit->abbreviation] = $unit; @@ -1030,12 +1071,13 @@ /** * Menu Callback - created output for the main recipe page. * - * @return $body + * @return + * $body */ function recipe_page() { $body = ""; - if (arg(1) == "feed") { + if (arg(1) == 'feed') { module_invoke('node', 'feed', module_invoke('taxonomy', 'select_nodes', recipe_get_recipe_terms(), 'or', 0, FALSE)); } else { @@ -1047,7 +1089,7 @@ if ($term != NULL) { $content = recipe_index($term->tid); if ($content != '') { - $body = theme('box', $term->name .'- '. t('Sub Categories'), $content); + $body = theme('box', t('@term-name - Sub categories', array('@term-name' => $term->name)), $content); } $terms = array_merge(array($term->tid), array_map('_recipe_get_tid_from_term', module_invoke('taxonomy', 'get_children', $term->tid))); @@ -1058,11 +1100,11 @@ $body = ''; if (variable_get('recipe_recent_box_enable', 1)) { - $body = theme('box', variable_get('recipe_recent_box_title', t('Latest Recipes')), module_invoke('node', 'title_list', recipe_get_latest(variable_get('recipe_recent_display', '5')), '') . theme('recipe_more_info', theme('feed_icon', url("recipe/feed"), t('Syndicate')))); + $body = theme('box', variable_get('recipe_recent_box_title', t('Latest recipes')), module_invoke('node', 'title_list', recipe_get_latest(variable_get('recipe_recent_display', '5')), '') . theme('recipe_more_info', theme('feed_icon', url("recipe/feed"), t('Syndicate')))); } $content = recipe_index(); if ($content != '') { - $body .= theme('box', t('Recipe Categories'), $content); + $body .= theme('box', t('Recipe categories'), $content); } } } @@ -1072,19 +1114,20 @@ /** * Builds a breadcrumb list. * - * @param breadcrumb a reference to the breadcrumb array. New items will be appending to this array. - * - * @return returns a term object if the last item in the url is a term, otherwise returns NULL. + * @param + * breadcrumb a reference to the breadcrumb array. New items will be appending to this array. + * @return + * returns a term object if the last item in the url is a term, otherwise returns NULL. */ function recipe_build_breadcrumbs(&$breadcrumb) { if (arg(1) != NULL) { $i = 1; $url = 'recipe'; - $breadcrumb[] = l(ucwords(t('Recipes')), $url); + $breadcrumb[] = l(t('Recipes'), $url); while (arg($i) != NULL) { $last_term = urldecode(arg($i)); $url = $url .'/'. urlencode($last_term); - $breadcrumb[] = l(ucwords($last_term), $url); + $breadcrumb[] = l($last_term, $url); $i++; } @@ -1097,7 +1140,8 @@ /** * Recursively traverses the term tree to construct the index. * - * @return string the output for this tree. + * @return + * String the output for this tree. */ function recipe_build_index(&$tree, $parent_url) { $output = ''; @@ -1109,7 +1153,7 @@ do { $cur = current($tree); $nex = next($tree); - if ($nex === false) { + if ($nex === FALSE) { $next_depth = -1; } else { @@ -1122,10 +1166,10 @@ if ($next_depth > $cur->depth) { $cur->children = recipe_build_index($tree, $cur->link); - // sync $next_depth, because 'next item' may be shoved forward + // Sync $next_depth, because 'next item' may be shoved forward. // Thanks for the patch Roderik. $nex = current($tree); - if ($nex === false) { + if ($nex === FALSE) { $next_depth = -1; } else { @@ -1136,7 +1180,8 @@ $cur->count = module_invoke('taxonomy', 'term_count_nodes', ($cur->tid)); $output .= theme('recipe_index_item', $cur); - }while ($cur->depth == $next_depth); + } + while ($cur->depth == $next_depth); return theme('recipe_list', $output); } @@ -1144,22 +1189,26 @@ /** * Constructs a url from the current url arguments list. * - * @return a string containing a formated URL. + * @return + * A string containing a formated URL. */ function recipe_get_current_url() { $arg_index = 1; $url = arg(0); + while ($argument = arg($arg_index)) { $url .= '/'. urlencode($argument); $arg_index++; } + return $url; } /** - * Get the latest recipes + * Get the latest recipes. * - * @return a database query result. + * @return + * A database query result. */ function recipe_get_latest($count = 0) { $tids = recipe_get_recipe_terms(); @@ -1167,9 +1216,10 @@ } /** - * Get all the terms associated with Recipes. + * Get all the terms associated with recipes. * - * @return an array of unique term ids. + * @return + * An array of unique term ids. */ function recipe_get_recipe_terms() { $vocabs = recipe_get_vocabularies(); @@ -1183,7 +1233,8 @@ /** * Gets all the vocabularies that are associated with the recipe module. * - * @return array the vocabularies. + * @return + * Array the vocabularies. */ function recipe_get_vocabularies() { $vocabularies = module_invoke('taxonomy', 'get_vocabularies', 'recipe'); @@ -1193,10 +1244,11 @@ /** * Constructs the recipe index page, using theme functions. * - * @return a string containing the output ready for display. + * @return + * A string containing the output ready for display. */ function recipe_index($tid = 0) { - $output = ""; + $output = ''; $vocabularies = recipe_get_vocabularies(); foreach ($vocabularies as $vocab) { @@ -1237,11 +1289,11 @@ foreach ($tmp as $ingredient) { // For preview, node->ingredients is an array, for actual display, it's an object if (is_array($ingredient)) { - if (isset($ingredient["name"])) { - $ingredient["name"] = check_plain($ingredient["name"]); + if (isset($ingredient['name'])) { + $ingredient['name'] = check_plain($ingredient['name']); } } - else if (is_object($ingredient) ) { + elseif (is_object($ingredient)) { if (isset($ingredient->name)) { $ingredient->name = check_plain($ingredient->name); } @@ -1259,10 +1311,9 @@ /** * Finds all nodes that match selected taxonomy conditions. - * This is just a copy of taxonomy_select_nodes() but - * includes node title field in the selection. - * Is this useful or try to find a taxonomy function - * to achieve this? + * This is just a copy of taxonomy_select_nodes(), but includes node title + * field in the selection. + * Is this useful or try to find a taxonomy function to achieve this? * * @param $tids * An array of term IDs to match. @@ -1290,6 +1341,7 @@ $descendant_tids[] = array_merge(array($tid), array_map('_recipe_get_tid_from_term', $tree)); } + // TODO: Use db_placeholder() if ($operator == 'or') { $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids)); if (module_exists('category')) { @@ -1340,7 +1392,8 @@ /** * Get all the terms in a given vocabulary. * - * @return an array of unique term ids. + * @return + * An array of unique term ids. */ function recipe_tax_get_terms($vid) { $result = db_query("SELECT tid FROM {term_data} WHERE vid = %d", $vid); @@ -1359,26 +1412,28 @@ switch ($op) { case 'insert': case 'update': - // TODO: Could filter for only nodes of type 'ingredient' - db_query("UPDATE {recipe_ingredient} SET link='%d' WHERE LOWER(name)='%s'", $node->nid, trim(strtolower($node->title)) ); + if ($node->type == 'ingredient') { + db_query("UPDATE {recipe_ingredient} SET link = %d WHERE LOWER(name) = '%s'", $node->nid, trim(strtolower($node->title))); + } break; } } /** * Helper function for array map purposes. - * @param term the term object from which the tid will be extracted. * - * @return the tid member of $term. + * @param term + * The term object from which the tid will be extracted. + * @return + * The tid member of $term. */ function _recipe_get_tid_from_term($term) { return $term->tid; } /** - * Theme functions group + * Theme functions group. */ - function recipe_theme() { return array( 'recipe_node' => array( @@ -1403,6 +1458,7 @@ ), ); } + /** * A custom theme function. * @@ -1412,16 +1468,21 @@ * way, style sheets can modify the output without requiring theme code. */ function theme_recipe_node($node, $yield_form = TRUE) { - // Get custom yield or default to a factor of 1 + // Get custom yield or default to a factor of 1. if ($yield_form && intval($node->yield) == $node->yield) { - if ($_POST['op'] == t('Change')) + if ($_POST['op'] == t('Change')) { $yield = $_POST['custom_yield']; + } else - if ($_POST['op'] == t('Halve')) - $yield = $_POST['custom_yield']/2; - else - if ($_POST['op'] == t('Double')) - $yield = $_POST['custom_yield']*2; + if ($_POST['op'] == t('Halve')) { + $yield = $_POST['custom_yield']/2; + } + else { + if ($_POST['op'] == t('Double')) { + $yield = $_POST['custom_yield']*2; + } + } + } if ($yield && $yield != $node->yield && $node->yield !=0) { $factor = $yield / $node->yield; @@ -1438,7 +1499,7 @@ $factor = 1; } - // Construct the $ingredients[] array + // Construct the $ingredients[] array. if ($node->ingredients) { foreach ($node->ingredients as $ingredient) { if (isset($ingredient->quantity) && $ingredient->name) { @@ -1458,7 +1519,7 @@ $ingredient->name = l($ingredient->name, 'node/'. $ingredient->link); } - $ingredients[] = $ingredient->quantity .' '. $ingredient->abbreviation .' '. $ingredient->name; + $ingredients[] = $ingredient->quantity .' recipe_unit_name($ingredient->unit_id))) . '">' . $ingredient->abbreviation .' '. $ingredient->name; } } } @@ -1479,8 +1540,9 @@ else { $preptime = t('!time hours', array('!time' => recipe_ingredient_quantity_from_decimal($node->preptime / 60))); } - $summary .= ''. t('Prep Time') .''. $preptime .''; + $summary .= ''. t('Prep time') .''. $preptime .''; } + $vocabs = taxonomy_get_vocabularies('recipe'); if (count($vocabs) > 0) { foreach ($vocabs as $vocab) { @@ -1507,84 +1569,87 @@ } function recipe_custom_yield_form($form_id, $node) { - $form['custom_yield_container'] = array( - '#type' => 'fieldset', - '#collapsible' => FALSE, - '#collapsed' => FALSE - ); - $form['custom_yield_container']['custom_yield'] = array( - '#type' => 'textfield', - '#default_value' => $node->yield, - '#size' => 2, - '#maxlength' => 4 - ); - $form['custom_yield_container']['submit'] = array( - '#type' => 'submit', - '#value' => t('Change') - ); - $form['custom_yield_container']['halve'] = array( - '#type' => 'submit', - '#value' => t('Halve') - ); - $form['custom_yield_container']['double'] = array( - '#type' => 'submit', - '#value' => t('Double') - ); + $form['custom_yield_container'] = array( + '#type' => 'fieldset', + '#collapsible' => FALSE, + '#collapsed' => FALSE, + ); + $form['custom_yield_container']['custom_yield'] = array( + '#type' => 'textfield', + '#default_value' => $node->yield, + '#size' => 2, + '#maxlength' => 4, + ); + $form['custom_yield_container']['submit'] = array( + '#type' => 'submit', + '#value' => t('Change'), + ); + $form['custom_yield_container']['halve'] = array( + '#type' => 'submit', + '#value' => t('Halve'), + ); + $form['custom_yield_container']['double'] = array( + '#type' => 'submit', + '#value' => t('Double'), + ); - return $form; + return $form; } /** * Controls the output of the rendered index list. * - * @return string the output for the index list. + * @return + * String the output for the index list. */ function theme_recipe_index(&$name, &$index_list) { - if ($index_list != "") { + if ($index_list != '') { return "
\n$index_list\n
\n"; } - return ""; + return ''; } /** * Displays a single index item. * - * @return string the output for this item. + * @return + * String the output for this item. */ function theme_recipe_index_item(&$term) { - $description = ($term->description != '') ? "

". $term->description ."

" : ''; + $description = ($term->description != '') ? '

' . $term->description . '

' : ''; if ($term->count > 0) { - return "
  • ". l($term->name ." ($term->count)", $term->link) ."
    ". $description . $term->children ."
    • "; + return '
  • ' . l(t('@term-name (@term-count)', array('@term-name' => $term->name, '@term-count' => $term->count)), $term->link) . '
    ' . $description . $term->children . '
    • '; } else { - return "
  • ". $term->name ." ($term->count)
    ". $description . $term->children ."
    • "; + return '
  • '. t('@term-name (@term-count)', array('@term-name' => $term->name, '@term-count' => $term->count)) . '
    ' . $description . $term->children . '
    • '; } } /** * Displays a single one level list. Called for each group of items at the same depth. * - * @return string the output for this list. + * @return + * String the output for this list. */ function theme_recipe_list(&$output) { if ($output != '') { - return "\n"; + return '\n"; } return ''; } /** - * Displays more information content, suck as "more" links, and - * feed images. + * Displays more information content, suck as "more" links, and feed images. * - * @return formatted string containint the output. + * @return + * Formatted string containing the output. */ function theme_recipe_more_info($content) { - return "
    ". $content ."
    "; + return '
    ' . $content . '
    '; } /** - * How the recipe's HTML export should be themed + * How the recipe's HTML export should be themed. * * @ingroup themeable */