? port_7.patch Index: smileys.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smileys/Attic/smileys.admin.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 smileys.admin.inc --- smileys.admin.inc 7 Apr 2010 18:03:05 -0000 1.1.2.6 +++ smileys.admin.inc 8 Oct 2010 16:37:45 -0000 @@ -30,8 +30,7 @@ function smileys_admin_settings() { '#title' => t('Smileys select-box settings'), ); $form['smileys_selectbox']['smileys_enable_for'] = array( - '#type' => 'markup', - '#value' => ''. t('Enable smileys select box for:') .'', + '#markup' => ''. t('Enable smileys select box for:') .'', ); $form['smileys_selectbox']['smileys_enable_for_nodes'] = array( '#type' => 'checkbox', @@ -177,9 +176,9 @@ function smileys_admin_list() { $form['smileys'] = array( '#type' => 'markup', - '#value' => theme('table', $header, $rows, array('id' => 'smileys_admin_list')), + '#value' => theme('table', array('header' => $header, 'rows' => $rows, array('attributes' => array('id' => 'smileys_admin_list')))), ); - $output .= drupal_render($form); + $output .= drupal_render_children($form); foreach ($packages as $package) { drupal_add_tabledrag('smileys_admin_list', 'match', 'sibling', 'smiley-category-select', 'smiley-category-' . str_replace(array('_', ' '), '-', drupal_strtolower($package)), NULL, FALSE); @@ -191,7 +190,7 @@ function smileys_admin_list() { $msg = t('No smileys found. You may !add, or !import.', array('!add' => l(t('add a custom smileys'), 'admin/settings/smileys/add'), '!import' => l(t('import smiley packages'), 'admin/settings/smileys/import'))); } else { - $msg = t('No smileys found. You may !add, or install smileys_import module & import smiley packages.', array('!add' => l(t('add custom smileys'), 'admin/settings/smileys/add'))); + $msg = t('No smileys found. You may !add, or install smileys_import module & import smiley packages.', array('!add' => l(t('add custom smileys'), 'admin/config/content/smileys/add'))); } drupal_set_message($msg); $output = ''; @@ -208,7 +207,10 @@ function smileys_admin_list() { function smileys_category_handle($orig_name, $new_name) { if (!empty($orig_name) && !empty($new_name)) { - db_query("UPDATE {smileys} SET package='%s' WHERE package='%s'", $new_name, $orig_name); + db_update('smileys') + ->condition('package', $orig_name) + ->fields(array('package' => $new_name)) + ->execute(); exit; } else { @@ -219,7 +221,10 @@ function smileys_category_handle($orig_n function smileys_promote_handle($action, $id = NULL) { if (!empty($id) && ($action == -1 || $action == 0 || $action == 1)) { - db_query('UPDATE {smileys} SET promote_to_box=%d WHERE id=%d', $action, $id); + db_update('smileys') + ->condition('id', $id) + ->fields(array('promote_to_box', $action) + ->execute(); exit(); } else { @@ -233,7 +238,10 @@ function smileys_weight_handle($weights, $weights = explode(':', $weights); $categories = explode(':', $categories); foreach ($ids as $key => $id) { - db_query("UPDATE {smileys} SET package='%s', weight=%d WHERE id=%d", $categories[$key], $weights[$key], $id); + db_update('smileys') + ->condition('id', $id) + ->fields(array('package' => $categories[$key], 'weight' => $weights[$key])) + ->execute(); $smileys[$id] = array('category' => $categories[$key], 'weight' => $weights[$key]); } } @@ -275,17 +283,27 @@ function smileys_admin_form_submit($form $form_values = $form_state['values']; $form_values['category'] = empty($form_values['category']) ? $form_values['category_other'] : $form_values['category']; + $smiley = array( + 'acronyms' => trim($form_values["acronyms"]), + 'image' => trim($form_values['image']), + 'description' => trim($form_values['description']), + 'standalone' => $form_values['standalone'], + 'promote_to_box' => $form_values['promote_to_box'], + 'package' => $form_values['category'], + ); + if (isset($form_values['id'])) { - db_query("UPDATE {smileys} SET acronyms='%s', image='%s', description='%s', standalone=%d, promote_to_box=%d, package='%s' WHERE id = %d", trim($form_values["acronyms"]), trim($form_values['image']), trim($form_values['description']), $form_values['standalone'], $form_values['promote_to_box'], $form_values['category'], $form_values['id']); + $smiley['id'] = $form_values['id']; + drupal_write_record('smileys', $smiley, array('id')); $message = t('Updated smiley: %smiley', array('%smiley' => $form_values['acronyms'])); } else { - db_query("INSERT INTO {smileys} (acronyms, image, description, standalone, promote_to_box, package) VALUES ('%s', '%s', '%s', %d, %d, '%s')", trim($form_values["acronyms"]), trim($form_values["image"]), trim($form_values["description"]), $form_values["standalone"], $form_values['promote_to_box'], $form_values['category']); + drupal_write_record('smileys', $smiley); $message = t('Added smiley: %smiley', array('%smiley' => $form_values['acronyms'])); } drupal_set_message($message); - $form_state['redirect'] = 'admin/settings/smileys'; + $form_state['redirect'] = 'admin/config/content/smileys'; } /** @@ -303,13 +321,13 @@ function smileys_admin_form_validate($fo function smileys_admin_form_delete($form, &$form_state) { smileys_admin_delete($form_state['values']['id'], FALSE); - $form_state['redirect'] = 'admin/settings/smileys'; + $form_state['redirect'] = 'admin/config/content/smileys'; return; } function smileys_admin_delete_confirm(&$form_state, $smiley_id) { $smiley_id = $smiley_id ? $smiley_id : arg(4); - $smiley = db_fetch_array(db_query('SELECT * FROM {smileys} WHERE id = %d', $smiley_id)); + $smiley = db_query('SELECT * FROM {smileys} WHERE id = :id', array(':id' => $smiley_id))->fetchAssoc(); $form = array(); return confirm_form( @@ -324,19 +342,21 @@ function smileys_admin_delete_confirm(&$ function smileys_admin_delete_confirm_submit($form, &$form_state) { smileys_admin_delete($form_state['values']['id'], FALSE); - $form_state['redirect'] = 'admin/settings/smileys'; + $form_state['redirect'] = 'admin/config/content/smileys'; } function smileys_admin_delete($smiley_id, $redirect = TRUE) { $smiley_id = $smiley_id ? $smiley_id : arg(4); - $smiley = db_fetch_array(db_query('SELECT * FROM {smileys} WHERE id = %d', $smiley_id)); + $smiley = db_query('SELECT * FROM {smileys} WHERE id = :id', array(':id' => $smiley_id))->fetchAssoc(); if ($smiley_id) { - db_query("DELETE FROM {smileys} WHERE id = %d", $smiley_id); + db_delete('smileys') + ->condition('id' => $smiley_id) + ->execute(); $message = t('Deleted smiley: %smiley', array('%smiley' => $smiley['acronyms'])); drupal_set_message($message); } if ($redirect) { - drupal_goto('admin/settings/smileys'); + drupal_goto('admin/config/content/smileys'); } } @@ -344,7 +364,7 @@ function smileys_admin_add($smiley_id = $path = drupal_get_path('module', 'smileys'); drupal_add_js($path . '/scripts/admin/smileys-admin.js', 'module', 'header', FALSE, TRUE, FALSE); if ($smiley_id) { - $smiley = db_fetch_array(db_query('SELECT * FROM {smileys} WHERE id = %d', $smiley_id)); + $smiley = db_query('SELECT * FROM {smileys} WHERE id = :id', array(':id' => $smiley_id))->fetchAssoc(); } return drupal_get_form('smileys_admin_form', $smiley); } Index: smileys.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smileys/Attic/smileys.info,v retrieving revision 1.2.2.2 diff -u -p -r1.2.2.2 smileys.info --- smileys.info 6 Apr 2008 19:24:01 -0000 1.2.2.2 +++ smileys.info 8 Oct 2010 16:37:45 -0000 @@ -2,4 +2,8 @@ name = Smileys description = "Replaces smileys inside posts with images." package = Smileys -core = 6.x \ No newline at end of file +core = 7.x +files[] = smileys.install +files[] = smileys.module +files[] = smileys.admin.inc +files[] = plist.inc \ No newline at end of file Index: smileys.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smileys/Attic/smileys.install,v retrieving revision 1.3.2.9 diff -u -p -r1.3.2.9 smileys.install --- smileys.install 5 Jan 2009 08:50:25 -0000 1.3.2.9 +++ smileys.install 8 Oct 2010 16:37:45 -0000 @@ -64,9 +64,6 @@ function smileys_schema() { * Implementation of hook_install(). */ function smileys_install() { - // Create tables. - $result = drupal_install_schema('smileys'); - // Feed sample data. if ($result) { $path = drupal_get_path('module', 'smileys') . '/packs/Roving/'; @@ -133,8 +130,6 @@ function smileys_uninstall() { variable_del('smileys_dialog_resizable'); variable_del('smileys_dialog_height'); variable_del('smileys_dialog_width'); - // Remove tables. - drupal_uninstall_schema('smileys'); } /** Index: smileys.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smileys/Attic/smileys.module,v retrieving revision 1.48.2.18 diff -u -p -r1.48.2.18 smileys.module --- smileys.module 7 Apr 2010 16:38:51 -0000 1.48.2.18 +++ smileys.module 8 Oct 2010 16:37:45 -0000 @@ -6,17 +6,24 @@ */ function smileys_help($path, $arg) { switch ($path) { - case 'admin/settings/smileys': - case 'admin/settings/smileys/list': + case 'admin/config/content/smileys': + case 'admin/config/content/smileys/list': return t('You can edit the Smileys that are recognized in your content.'); } } /** - * Implementation of hook_perm(). + * Implementation of hook_permission(). */ -function smileys_perm() { - return array('administer smileys', 'use smiley select box'); +function smileys_permission() { + return array( + 'administer smileys' => array( + 'title' => t('Administer Smileys'), + ), + 'use smiley select box' => array( + 'title' => t('Use smiley select box'), + ), + ); } /** @@ -45,20 +52,22 @@ function _smileys_list($refresh = 0, $qu } /** - * Implementation of hook_block(). + * Implements of hook_block_info(). */ -function smileys_block($op = 'list', $delta = 0) { - if ($op == 'list') { - $blocks[0]['info'] = t('Smileys on submission pages'); - return $blocks; - } - else if ($op == 'view') { - switch ($delta) { - case 0: - $block['subject'] = t('Smileys'); - $block['content'] = $GLOBALS['display_smileys_block'] ? smileys_table() : ''; - return $block; - } +function smileys_block_info() { + $blocks[0]['info'] = t('Smileys on submission pages'); + return $blocks; +} + +/** + * Implements hook_block_view(). + */ +function smileys_block_view($delta) { + switch ($delta) { + case 0: + $block['subject'] = t('Smileys'); + $block['content'] = $GLOBALS['display_smileys_block'] ? smileys_table() : ''; + return $block; } } @@ -71,7 +80,7 @@ function smileys_form_alter(&$form, $for } if ($form_id == 'comment_form') { - $node_type = db_result(db_query('SELECT type FROM {node} WHERE nid=%d', $form['nid']['#value'])); + $node_type = db_query('SELECT type FROM {node} WHERE nid = :nid', array(':nid' => $form['nid']['#value']))->fetchField(); } else if (!empty($form['type']['#value'])) { $node_type = $form['type']['#value']; @@ -190,12 +199,13 @@ function _smileys_select_table($promoted function smileys_theme() { return array( 'smileys_select_table' => array( - 'arguments' => array('promoted' => FALSE), + 'variables' => array('promoted' => FALSE), ), ); } -function theme_smileys_select_table($promoted = false) { +function theme_smileys_select_table($vars) { + $promoted = $vars['promoted']; return '
'. _smileys_select_table($promoted) .'
'; } @@ -208,7 +218,14 @@ function smileys_table() { foreach ($list as $smiley) { $acronyms = explode(' ', $smiley->acronyms); $rows[] = array( - ''. $acronyms[0] .'', + theme('image', array( + 'path' => $smiley->image, + 'attributes' => array( + 'alt' => $acronyms[0], + 'title' => check_plain($smiley->description), + 'class' => array('smiley-class'), + ), + )), check_plain($smiley->acronyms) ); } @@ -218,10 +235,9 @@ function smileys_table() { '#collapsible' => TRUE, ); $form['smileys']['smileys_box'] = array( - '#type' => 'markup', - '#value' => theme('table', $header, $rows), + '#markup' => theme('table', array('header' => $header, 'rows' => $rows)), ); - $output .= drupal_render($form); + $output .= drupal_render_children($form); return $output; } @@ -230,25 +246,23 @@ function smileys_list() { } /** - * Implementation of hook_filter(). + * Implements hook_filter_info(). */ -function smileys_filter($op, $delta = 0, $format = -1, $text = "") { - switch ($op) { - case 'list': - return array(0 => t('Smileys filter')); - case 'description': - return t('Replaces smileys inside posts with images.'); +function smileys_filter_info() { + $filters['smileys'] = array( + 'title' => t('Smileys filter'), + 'description' => t('Replaces smileys inside posts with images.'), + 'settings callback' => '_smileys_filter_settings', + 'process callback' => 'smileys_filter_process', + ); + return $filters; +} case 'settings': $form['smileys_filter'] = array('#type' => 'fieldset', '#title' => t('Smileys filter'), '#value' => t('You can define a global list of smileys on the !page.', array('!page' => l(t('smileys settings page'), 'admin/settings/smileys')))); return $form; - case "process": - return smileys_filter_process($text); - default: - return $text; - } } -function smileys_filter_process($text) { +function smileys_filter_process($text, $format) { $text = ' ' . $text . ' '; $list = _smileys_list(0, ' ORDER BY weight'); @@ -297,43 +311,43 @@ function smileys_filter_process($text) { function smileys_menu() { $items = array(); - $items['admin/settings/smileys'] = array( - 'title' => t('Smileys'), - 'description' => t('Manage Smileys and toggle select box behavior for nodes and comments.'), + $items['admin/config/content/smileys'] = array( + 'title' => 'Smileys', + 'description' => 'Manage Smileys and toggle select box behavior for nodes and comments.', 'page callback' => 'smileys_admin_list', 'access arguments' => array('administer smileys'), 'file' => 'smileys.admin.inc', ); - $items['admin/settings/smileys/list'] = array( - 'title' => t('List'), + $items['admin/config/content/smileys/list'] = array( + 'title' => 'List', 'page callback' => 'smileys_admin_list', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, 'file' => 'smileys.admin.inc', ); - $items['admin/settings/smileys/add'] = array( - 'title' => t('Add'), + $items['admin/config/content/smileys/add'] = array( + 'title' => 'Add', 'page callback' => 'smileys_admin_add', 'access arguments' => array('administer smileys'), - 'type' => MENU_LOCAL_TASK, + 'type' => MENU_LOCAL_ACTION, 'file' => 'smileys.admin.inc', ); - $items['admin/settings/smileys/configure'] = array( - 'title' => t('Settings'), - 'description' => t('Smileys configuration.'), + $items['admin/config/content/smileys/configure'] = array( + 'title' => 'Settings', + 'description' => 'Smileys configuration.', 'page callback' => 'drupal_get_form', 'page arguments' => array('smileys_admin_settings'), 'access arguments' => array('administer smileys'), 'weight' => 8, - 'type' => MENU_LOCAL_TASK, + 'type' => MENU_LOCAL_ACTION, 'file' => 'smileys.admin.inc', ); - $items['admin/settings/smileys/edit/%'] = array( - 'title' => t('Edit Smiley'), + $items['admin/config/content/smileys/edit'] = array( + 'title' => 'Edit Smiley', 'page callback' => 'smileys_admin_add', 'page arguments' => array(4), 'access arguments' => array('administer smileys'), @@ -341,8 +355,8 @@ function smileys_menu() { 'file' => 'smileys.admin.inc', ); - $items['admin/settings/smileys/delete/%'] = array( - 'title' => t('Delete Smiley'), + $items['admin/config/content/smileys/delete'] = array( + 'title' => 'Delete Smiley', 'page callback' => 'drupal_get_form', 'page arguments' => array('smileys_admin_delete_confirm', 4), 'access arguments' => array('administer smileys'), @@ -350,7 +364,7 @@ function smileys_menu() { 'file' => 'smileys.admin.inc', ); - $items['admin/settings/smileys/category'] = array( + $items['admin/config/content/smileys/category'] = array( 'page callback' => 'smileys_category_handle', 'access arguments' => array('administer smileys'), 'type' => MENU_CALLBACK, Index: smileys_import.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smileys/Attic/smileys_import.info,v retrieving revision 1.2.2.3 diff -u -p -r1.2.2.3 smileys_import.info --- smileys_import.info 29 Mar 2010 17:04:18 -0000 1.2.2.3 +++ smileys_import.info 8 Oct 2010 16:37:45 -0000 @@ -3,4 +3,5 @@ name = Smileys Import description = "Import phpBB or Adium smiley packages." dependencies[] = smileys package = Smileys -core = 6.x \ No newline at end of file +core = 7.x +files[] = smileys_import.module \ No newline at end of file Index: smileys_import.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/smileys/Attic/smileys_import.module,v retrieving revision 1.2.2.11 diff -u -p -r1.2.2.11 smileys_import.module --- smileys_import.module 27 Jun 2009 14:48:11 -0000 1.2.2.11 +++ smileys_import.module 8 Oct 2010 16:37:45 -0000 @@ -6,7 +6,7 @@ */ function smileys_import_help($section) { switch ($section) { - case 'admin/settings/smileys/import': + case 'admin/config/content/smileys/import': return t("To import new Smileys, download smiley packs for !phpBB or !Adium and extract them in smileys folder under website's files directory.", array('!phpBB' => l('phpBB', 'http://www.phpbb.com/styles/db/index.php?i=browse&mode=group:component&sub=smilies'), '!Adium' => l('Adium', 'http://www.adiumxtras.com/index.php?a=search&cat_id=2'))); } } @@ -17,26 +17,26 @@ function smileys_import_help($section) { function smileys_import_menu() { $items = array(); - $items['admin/settings/smileys/import'] = array( + $items['admin/config/content/smileys/import'] = array( 'title' => t('Import'), 'page callback' => 'smileys_import_page', 'access arguments' => array('administer smileys'), 'weight' => 2, - 'type' => MENU_LOCAL_TASK, + 'type' => MENU_LOCAL_ACTION, ); - $items['admin/settings/smileys/export'] = array( + $items['admin/config/content/smileys/export'] = array( 'title' => t('Export'), 'page callback' => 'smileys_export_page', 'access arguments' => array('administer smileys'), 'weight' => 3, - 'type' => MENU_LOCAL_TASK, + 'type' => MENU_LOCAL_ACTION, ); - $items['admin/settings/smileys/import/add'] = array( + $items['admin/config/content/smileys/import/add'] = array( 'page callback' => 'smileys_import_add', 'access arguments' => array('administer smileys'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/smileys/import/delete'] = array( + $items['admin/config/content/smileys/import/delete'] = array( 'page callback' => 'smileys_import_delete', 'access arguments' => array('administer smileys'), 'type' => MENU_CALLBACK, @@ -53,14 +53,14 @@ function smileys_import_page() { $rows = array(); $packs = smileys_import_packs(); foreach ($packs as $pack) { - $smileyp = db_fetch_array(db_query("SELECT * FROM {smileys} WHERE package = '%s'", $pack->name)); - $option_link = $smileyp ? l(t('Uninstall'), 'admin/settings/smileys/import/delete/'. $pack->name) : l(t('Install'), 'admin/settings/smileys/import/add/'. $pack->name); + $smileyp = db_query("SELECT * FROM {smileys} WHERE package = :package", array(':package' => $pack->name))->fetchAssoc(); + $option_link = $smileyp ? l(t('Uninstall'), 'admin/config/content/smileys/import/delete/'. $pack->name) : l(t('Install'), 'admin/config/content/smileys/import/add/'. $pack->name); $rows[] = array( '' . $pack->name . '', $option_link ); } - $output = theme('table', $header, $rows); + $output = theme('table', array('header' => $header, 'rows' => $rows)); if (empty($rows)) { drupal_set_message(t('No smiley packs found.')); $output = ''; @@ -73,15 +73,15 @@ function smileys_import_page() { */ function smileys_export_page() { if ($package = arg(4)) { - $smileys = db_query("SELECT * FROM {smileys} WHERE package = '%s' ORDER BY weight", $package); + $smileys = db_query("SELECT * FROM {smileys} WHERE package = :package ORDER BY weight", array(':package' => $package)); $path = drupal_get_path('module', 'smileys'); if (!$packd = smileys_import_packs($package)) { drupal_set_message(t('Cannot find smiley package %pack.', array('%pack' => $package))); - drupal_goto('admin/settings/smileys/export'); + drupal_goto('admin/config/content/smileys/export'); } $smile_pak = ""; $delimeter = '=+:'; - while ($smiley = db_fetch_object($smileys)) { + foreach ($smileys as $smiley) { $smile_pak .= str_replace(dirname($packd->filename) . '/', '', $smiley->image) . $delimeter; $smile_pak .= $smiley->description . $delimeter; $smile_pak .= $smiley->acronyms . "\n"; @@ -108,7 +108,7 @@ function smileys_export_page() { ); } } - $output = theme('table', $header, $rows); + $output = theme('table', array('header' => $header, 'rows' => $rows)); if (empty($rows)) { drupal_set_message(t('No smiley packs to export.')); $output = ''; @@ -205,13 +205,14 @@ function smileys_import_add_plist($plist $acronyms = implode(' ', $smiley['Equivalents']); $acronyms = str_replace("<", "<", $acronyms); $acronyms = str_replace(">", ">", $acronyms); - db_query( "INSERT INTO {smileys} (acronyms, image, description, standalone, promote_to_box, package) VALUES ('%s', '%s', '%s', %d, 0, '%s')", - $acronyms, - drupal_get_path('module', 'smileys') . '/packs/' . $plist_pack . $extension . '/' . $file, - $smiley['Name'], - 1, - $plist_pack - ); + drupal_write_record('smileys', array( + 'acronyms' => $acronyms, + 'image' => drupal_get_path('module', 'smileys') . '/packs/' . $plist_pack . $extension . '/' . $file, + 'description' => $smiley['Name'], + 'standalone' => 1, + 'promote_to_box' => 0, + 'package' => $plist_pack, + )); } } @@ -230,7 +231,14 @@ function smileys_import_add_pak($pack) { for ($j = 2; $j < count($smile_data); $j++) { $smile_data[$j] = str_replace("<", "<", $smile_data[$j]); $smile_data[$j] = str_replace(">", ">", $smile_data[$j]); - db_query("INSERT INTO {smileys} (acronyms, image, description, standalone, promote_to_box, package) VALUES ('%s', '%s', '%s', %d, 0, '%s')", str_replace("\'", "''", $smile_data[$j]), dirname($packd->filename) . '/' . str_replace("\'", "''", $smile_data[0]), str_replace("\'", "''", $smile_data[1]), 1, $pack); + drupal_write_record('smileys', array( + 'acronyms' => str_replace("\'", "''", $smile_data[$j]), + 'image' => dirname($packd->filename) . '/' . str_replace("\'", "''", $smile_data[0]), + 'description' => str_replace("\'", "''", $smile_data[1]), + 'standalone' => 1, + 'promote_to_box' => 0, + 'package' => $pack, + )); } } } @@ -240,10 +248,12 @@ function smileys_import_add_pak($pack) { */ function smileys_import_delete($packname, $redirect = 0) { $pack = $packname ? $packname : arg(5); - db_query("DELETE FROM {smileys} WHERE package = '%s'", $pack); + db_delete('smileys') + ->conditiion('package', $pack) + ->execute(); if ($redirect == 0) { drupal_set_message(t('Smiley package %pack uninstalled.', array('%pack' => $pack))); - drupal_goto('admin/settings/smileys/import'); + drupal_goto('admin/config/content/smileys/import'); } }