/[drupal]/contributions/modules/bookmarks2/bookmarks2.module
ViewVC logotype

Diff of /contributions/modules/bookmarks2/bookmarks2.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.8.4.5, Tue Aug 5 12:49:31 2008 UTC revision 1.8.4.6, Tue Aug 5 13:02:41 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: bookmarks2.module,v 1.8.4.4 2008/07/26 18:00:53 sanduhrs Exp $  // $Id: bookmarks2.module,v 1.8.4.5 2008/08/05 12:49:31 sanduhrs Exp $
3    
4  /**  /**
5     * Bookmarks2
6     *
7   * @file   * @file
8   * Lets users keep bookmarks   * Lets users keep bookmarks
9   *   *
# Line 116  function bookmarks2_menu($may_cache) { Line 118  function bookmarks2_menu($may_cache) {
118      $items[] = array(      $items[] = array(
119        'path' => "admin/settings/bookmarks2",        'path' => "admin/settings/bookmarks2",
120        'title' => t('Bookmarks settings'),        'title' => t('Bookmarks settings'),
121          'description' => t('Change bookmarks settings.'),
122        'callback' => 'drupal_get_form',        'callback' => 'drupal_get_form',
123        'callback arguments' => array('bookmarks2_admin_settings'),        'callback arguments' => array('bookmarks2_admin_settings'),
124        'access' => user_access("access administration pages"),        'access' => user_access("access administration pages"),
# Line 301  function bookmarks2_delete_confirm_submi Line 304  function bookmarks2_delete_confirm_submi
304   *   *
305   * @todo name the folder in the question   * @todo name the folder in the question
306   */   */
307  function bookmarks2_folder_delete_confirm(&$form_state, $fid = NULL) {  function bookmarks2_folder_delete_confirm($fid = NULL) {
308    if (!$fid) {    if (!$fid) {
309      $fid = (int) check_plain($_GET['fid']);      $fid = (int) check_plain($_GET['fid']);
310    }    }
# Line 320  function bookmarks2_folder_delete_confir Line 323  function bookmarks2_folder_delete_confir
323   * @param int $fid   * @param int $fid
324   * @return string   * @return string
325   */   */
326  function bookmarks2_folder_delete_confirm_submit($form, &$form_state, $fid = 0, $child = false) {  function bookmarks2_folder_delete_confirm_submit($form_id, $form_values, $fid = 0, $child = false) {
327    global $user;    global $user;
328    
329    if ($child) {    if ($child) {
# Line 332  function bookmarks2_folder_delete_confir Line 335  function bookmarks2_folder_delete_confir
335      }      }
336    }    }
337    else {    else {
338      if (!is_numeric($form_state['values']['fid'])) {      if (!is_numeric($form_values['fid'])) {
339        drupal_set_message(t('Folder ID is not the correct format!', 'error'));        drupal_set_message(t('Folder ID is not the correct format!', 'error'));
340      }      }
341      else {      else {
342        db_query('DELETE FROM {bookmarks2} WHERE uid = %d AND fid = %d', $user->uid, $form_state['values']['fid']);        db_query('DELETE FROM {bookmarks2} WHERE uid = %d AND fid = %d', $user->uid, $form_values['fid']);
343        db_query('DELETE FROM {bookmarks2_folders} WHERE uid = %d AND fid = %d', $user->uid, $form_state['values']['fid']);        db_query('DELETE FROM {bookmarks2_folders} WHERE uid = %d AND fid = %d', $user->uid, $form_values['fid']);
344        drupal_set_message(t('Deleted bookmark folder.'));        drupal_set_message(t('Deleted bookmark folder.'));
345      }      }
346    
Legend:
Removed from v.1.8.4.5  
changed lines
  Added in v.1.8.4.6
  ViewVC Help
Powered by ViewVC 1.1.2