Changeset 28587


Ignore:
Timestamp:
06/02/14 09:55:46 (5 years ago)
Author:
mistic100
Message:

feature 3010 : replace trigger_action/event by trigger_notify/change

Location:
trunk
Files:
62 edited

Legend:

Unmodified
Added
Removed
  • trunk/about.php

    r26461 r28587  
    3838$page['body_id'] = 'theAboutPage'; 
    3939 
    40 trigger_action('loc_begin_about'); 
     40trigger_notify('loc_begin_about'); 
    4141 
    4242$template->set_filename('about', 'about.tpl'); 
  • trunk/admin.php

    r28490 r28587  
    3434include_once(PHPWG_ROOT_PATH.'admin/include/add_core_tabs.inc.php'); 
    3535 
    36 trigger_action('loc_begin_admin'); 
     36trigger_notify('loc_begin_admin'); 
    3737 
    3838// +-----------------------------------------------------------------------+ 
     
    245245// +-----------------------------------------------------------------------+ 
    246246 
    247 $plugin_menu_links = trigger_event('get_admin_plugin_menu_links', array() ); 
     247$plugin_menu_links = trigger_change('get_admin_plugin_menu_links', array() ); 
    248248 
    249249function UC_name_compare($a, $b) 
     
    285285// +-----------------------------------------------------------------------+ 
    286286 
    287 trigger_action('loc_begin_admin_page'); 
     287trigger_notify('loc_begin_admin_page'); 
    288288include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php'); 
    289289 
     
    299299include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    300300 
    301 trigger_action('loc_end_admin'); 
     301trigger_notify('loc_end_admin'); 
    302302 
    303303flush_page_messages(); 
  • trunk/admin/album_notification.php

    r27538 r28587  
    8484    $_POST['group'], 
    8585    array( 
    86       'subject' => l10n('[%s] Visit album %s', $conf['gallery_title'], trigger_event('render_category_name', $category['name'], 'admin_cat_list')), 
     86      'subject' => l10n('[%s] Visit album %s', $conf['gallery_title'], trigger_change('render_category_name', $category['name'], 'admin_cat_list')), 
    8787      // TODO : change this language variable to 'Visit album %s' 
    8888      // TODO : 'language_selected' => .... 
     
    9292      'assign' => array( 
    9393        'IMG_URL' => $img_url, 
    94         'CAT_NAME' => trigger_event('render_category_name', $category['name'], 'admin_cat_list'), 
     94        'CAT_NAME' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'), 
    9595        'LINK' => make_index_url(array( 
    9696            'category' => array( 
    9797              'id' => $category['id'], 
    98               'name' => trigger_event('render_category_name', $category['name'], 'admin_cat_list'), 
     98              'name' => trigger_change('render_category_name', $category['name'], 'admin_cat_list'), 
    9999              'permalink' => $category['permalink'] 
    100100              ) 
  • trunk/admin/batch_manager.php

    r28459 r28587  
    302302  } 
    303303 
    304   $filter_sets = trigger_event('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']); 
     304  $filter_sets = trigger_change('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']); 
    305305} 
    306306 
  • trunk/admin/batch_manager_global.php

    r28559 r28587  
    4141check_status(ACCESS_ADMINISTRATOR); 
    4242 
    43 trigger_action('loc_begin_element_set_global'); 
     43trigger_notify('loc_begin_element_set_global'); 
    4444 
    4545check_input_parameter('del_tags', $_POST, true, PATTERN_ID); 
     
    405405  } 
    406406 
    407   trigger_action('element_set_global_action', $action, $collection); 
     407  trigger_notify('element_set_global_action', $action, $collection); 
    408408} 
    409409 
     
    430430} 
    431431 
    432 $prefilters = trigger_event('get_batch_manager_prefilters', $prefilters); 
     432$prefilters = trigger_change('get_batch_manager_prefilters', $prefilters); 
    433433usort($prefilters, 'UC_name_compare'); 
    434434 
     
    675675  )); 
    676676 
    677 trigger_action('loc_end_element_set_global'); 
     677trigger_notify('loc_end_element_set_global'); 
    678678 
    679679//----------------------------------------------------------- sending html code 
  • trunk/admin/batch_manager_unit.php

    r28532 r28587  
    4040check_status(ACCESS_ADMINISTRATOR); 
    4141 
    42 trigger_action('loc_begin_element_set_unit'); 
     42trigger_notify('loc_begin_element_set_unit'); 
    4343 
    4444// +-----------------------------------------------------------------------+ 
     
    255255} 
    256256 
    257 trigger_action('loc_end_element_set_unit'); 
     257trigger_notify('loc_end_element_set_unit'); 
    258258 
    259259// +-----------------------------------------------------------------------+ 
  • trunk/admin/cat_list.php

    r26461 r28587  
    3434check_status(ACCESS_ADMINISTRATOR); 
    3535 
    36 trigger_action('loc_begin_cat_list'); 
     36trigger_notify('loc_begin_cat_list'); 
    3737 
    3838if (!empty($_POST) or isset($_GET['delete'])) 
     
    325325    array( 
    326326      'NAME'       =>  
    327         trigger_event( 
     327        trigger_change( 
    328328          'render_category_name', 
    329329          $category['name'], 
     
    364364} 
    365365 
    366 trigger_action('loc_end_cat_list'); 
     366trigger_notify('loc_end_cat_list'); 
    367367 
    368368// +-----------------------------------------------------------------------+ 
  • trunk/admin/cat_modify.php

    r28533 r28587  
    104104check_status(ACCESS_ADMINISTRATOR); 
    105105 
    106 trigger_action('loc_begin_cat_modify'); 
     106trigger_notify('loc_begin_cat_modify'); 
    107107 
    108108//---------------------------------------------------------------- verification 
     
    369369} 
    370370 
    371 trigger_action('loc_end_cat_modify'); 
     371trigger_notify('loc_end_cat_modify'); 
    372372 
    373373//----------------------------------------------------------- sending html code 
  • trunk/admin/comments.php

    r26461 r28587  
    201201      'ID' => $row['id'], 
    202202      'TN_SRC' => $thumb, 
    203       'AUTHOR' => trigger_event('render_comment_author', $author_name), 
     203      'AUTHOR' => trigger_change('render_comment_author', $author_name), 
    204204      'DATE' => format_date($row['date'], true), 
    205       'CONTENT' => trigger_event('render_comment_content',$row['content']), 
     205      'CONTENT' => trigger_change('render_comment_content',$row['content']), 
    206206      'IS_PENDING' => ('false' == $row['validated']), 
    207207      ) 
  • trunk/admin/help.php

    r28101 r28587  
    4747$tabsheet->assign(); 
    4848 
    49 trigger_action('loc_end_help'); 
     49trigger_notify('loc_end_help'); 
    5050 
    5151$template->set_filenames(array('help' => 'help.tpl')); 
  • trunk/admin/history.php

    r28500 r28587  
    217217 
    218218  /*TODO - no need to get a huge number of rows from db (should take only what needed for display + SQL_CALC_FOUND_ROWS*/ 
    219   $data = trigger_event('get_history', array(), $page['search'], $types); 
     219  $data = trigger_change('get_history', array(), $page['search'], $types); 
    220220  usort($data, 'history_compare'); 
    221221 
     
    317317    while ($row=pwg_db_fetch_assoc($result)) 
    318318    { 
    319       $name_of_tag[ $row['id'] ] = '<a href="'.make_index_url( array('tags'=>array($row))).'">'.trigger_event("render_tag_name", $row['name'], $row).'</a>'; 
     319      $name_of_tag[ $row['id'] ] = '<a href="'.make_index_url( array('tags'=>array($row))).'">'.trigger_change("render_tag_name", $row['name'], $row).'</a>'; 
    320320    } 
    321321  } 
     
    409409      if (isset($image_infos[$line['image_id']]['label'])) 
    410410      { 
    411         $image_title.= ' '.trigger_event('render_element_description', $image_infos[$line['image_id']]['label']); 
     411        $image_title.= ' '.trigger_change('render_element_description', $image_infos[$line['image_id']]['label']); 
    412412      } 
    413413      else 
  • trunk/admin/include/check_integrity.class.php

    r26461 r28587  
    6767    $this->build_ignore_list = array(); 
    6868 
    69     trigger_action('list_check_integrity', $this); 
     69    trigger_notify('list_check_integrity', $this); 
    7070 
    7171    // Information 
  • trunk/admin/include/functions.php

    r28572 r28587  
    163163  pwg_query($query); 
    164164 
    165   trigger_action('delete_categories', $ids); 
     165  trigger_notify('delete_categories', $ids); 
    166166} 
    167167 
     
    251251    return 0; 
    252252  } 
    253   trigger_action('begin_delete_elements', $ids); 
     253  trigger_notify('begin_delete_elements', $ids); 
    254254 
    255255  if ($physical_deletion) 
     
    326326  } 
    327327 
    328   trigger_action('delete_elements', $ids); 
     328  trigger_notify('delete_elements', $ids); 
    329329  return count($ids); 
    330330} 
     
    384384  pwg_query($query); 
    385385 
    386   trigger_action('delete_user', $user_id); 
     386  trigger_notify('delete_user', $user_id); 
    387387} 
    388388 
     
    15741574    if (count($existing_tags = array_from_query($query, 'id')) == 0) 
    15751575    { 
    1576       $url_name = trigger_event('render_tag_url', $tag_name); 
     1576      $url_name = trigger_change('render_tag_url', $tag_name); 
    15771577      // search existing by url name 
    15781578      $query = ' 
     
    18421842    pwg_query($query); 
    18431843  } 
    1844   trigger_action('invalidate_user_cache', $full); 
     1844  trigger_notify('invalidate_user_cache', $full); 
    18451845} 
    18461846 
     
    19771977      array( 
    19781978        'name' => $tag_name, 
    1979         'url_name' => trigger_event('render_tag_url', $tag_name), 
     1979        'url_name' => trigger_change('render_tag_url', $tag_name), 
    19801980        ) 
    19811981      ); 
     
    23272327  { 
    23282328    $raw_name = $row['name']; 
    2329     $name = trigger_event('render_tag_name', $raw_name, $row); 
     2329    $name = trigger_change('render_tag_name', $raw_name, $row); 
    23302330 
    23312331    $taglist[] =  array( 
     
    23362336    if (!$only_user_language) 
    23372337    { 
    2338       $alt_names = trigger_event('get_tag_alt_names', array(), $raw_name); 
     2338      $alt_names = trigger_change('get_tag_alt_names', array(), $raw_name); 
    23392339 
    23402340      foreach( array_diff( array_unique($alt_names), array($name) ) as $alt) 
  • trunk/admin/include/functions_history.inc.php

    r26946 r28587  
    178178 
    179179add_event_handler('get_history', 'get_history', EVENT_HANDLER_PRIORITY_NEUTRAL, 3); 
    180 trigger_action('functions_history_included'); 
     180trigger_notify('functions_history_included'); 
    181181 
    182182?> 
  • trunk/admin/include/image.class.php

    r28199 r28587  
    6565    $this->source_filepath = $source_filepath; 
    6666 
    67     trigger_action('load_image_library', array(&$this) ); 
     67    trigger_notify('load_image_library', array(&$this) ); 
    6868 
    6969    if (is_object($this->image)) 
  • trunk/admin/include/tabsheet.class.php

    r26461 r28587  
    8989  function select($name) 
    9090  { 
    91     $this->sheets = trigger_event('tabsheet_before_select', $this->sheets, $this->uniqid); 
     91    $this->sheets = trigger_change('tabsheet_before_select', $this->sheets, $this->uniqid); 
    9292    if (!array_key_exists($name, $this->sheets)) 
    9393    { 
  • trunk/admin/maintenance.php

    r28432 r28587  
    221221 
    222222//$advanced_features is array of array composed of CAPTION & URL 
    223 $advanced_features = trigger_event( 
     223$advanced_features = trigger_change( 
    224224  'get_admin_advanced_features_links', 
    225225  $advanced_features 
  • trunk/admin/notification_by_mail.php

    r26461 r28587  
    254254 
    255255        $customize_mail_content =  
    256           trigger_event('nbm_render_global_customize_mail_content', $customize_mail_content); 
     256          trigger_change('nbm_render_global_customize_mail_content', $customize_mail_content); 
    257257 
    258258 
     
    341341 
    342342              $nbm_user_customize_mail_content =  
    343                 trigger_event('nbm_render_user_customize_mail_content', 
     343                trigger_change('nbm_render_user_customize_mail_content', 
    344344                  $customize_mail_content, $nbm_user); 
    345345              if (!empty($nbm_user_customize_mail_content)) 
     
    483483// +-----------------------------------------------------------------------+ 
    484484add_event_handler('nbm_render_global_customize_mail_content', 'render_global_customize_mail_content'); 
    485 trigger_action('nbm_event_handler_added'); 
     485trigger_notify('nbm_event_handler_added'); 
    486486 
    487487 
  • trunk/admin/picture_modify.php

    r28542 r28587  
    416416  )); 
    417417 
    418 trigger_action('loc_end_picture_modify'); 
     418trigger_notify('loc_end_picture_modify'); 
    419419 
    420420//----------------------------------------------------------- sending html code 
  • trunk/admin/popuphelp.php

    r26461 r28587  
    5656  } 
    5757 
    58   $help_content = trigger_event( 
     58  $help_content = trigger_change( 
    5959    'get_popup_help_content', $help_content, $_GET['page']); 
    6060} 
  • trunk/admin/site_manager.php

    r26461 r28587  
    177177  //$plugin_links is array of array composed of U_HREF, U_HINT & U_CAPTION 
    178178  $plugin_links = 
    179     trigger_event('get_admins_site_links', 
     179    trigger_change('get_admins_site_links', 
    180180      $plugin_links, $row['id'], $is_remote); 
    181181  $tpl_var['plugin_links'] = $plugin_links; 
  • trunk/admin/tags.php

    r26650 r28587  
    7777          'id' => $tag_id, 
    7878          'name' => addslashes($tag_name), 
    79           'url_name' => trigger_event('render_tag_url', $tag_name), 
     79          'url_name' => trigger_change('render_tag_url', $tag_name), 
    8080          ); 
    8181      } 
     
    134134          array( 
    135135            'name' => $tag_name, 
    136             'url_name' => trigger_event('render_tag_url', $tag_name), 
     136            'url_name' => trigger_change('render_tag_url', $tag_name), 
    137137            ) 
    138138          ); 
     
    219219      while ($row = pwg_db_fetch_assoc($result)) 
    220220      { 
    221         $name_of_tag[ $row['id'] ] = trigger_event('render_tag_name', $row['name'], $row); 
     221        $name_of_tag[ $row['id'] ] = trigger_change('render_tag_name', $row['name'], $row); 
    222222      } 
    223223 
     
    359359foreach ($orphan_tags as $tag) 
    360360{ 
    361   $orphan_tag_names[] = trigger_event('render_tag_name', $tag['name'], $tag); 
     361  $orphan_tag_names[] = trigger_change('render_tag_name', $tag['name'], $tag); 
    362362} 
    363363 
     
    394394{ 
    395395  $raw_name = $tag['name']; 
    396   $tag['name'] = trigger_event('render_tag_name', $raw_name, $tag); 
     396  $tag['name'] = trigger_change('render_tag_name', $raw_name, $tag); 
    397397  $tag['counter'] = intval(@$tag_counters[ $tag['id'] ]); 
    398398  $tag['U_VIEW'] = make_index_url(array('tags'=>array($tag))); 
    399399  $tag['U_EDIT'] = 'admin.php?page=batch_manager&amp;filter=tag-'.$tag['id']; 
    400400 
    401   $alt_names = trigger_event('get_tag_alt_names', array(), $raw_name); 
     401  $alt_names = trigger_change('get_tag_alt_names', array(), $raw_name); 
    402402  $alt_names = array_diff( array_unique($alt_names), array($tag['name']) ); 
    403403  if (count($alt_names)) 
  • trunk/admin/themes_installed.php

    r27896 r28587  
    173173  ); 
    174174 
    175 trigger_action('loc_end_themes_installed'); 
     175trigger_notify('loc_end_themes_installed'); 
    176176 
    177177$template->set_filenames(array('themes' => 'themes_installed.tpl')); 
  • trunk/comments.php

    r28164 r28587  
    9090  ); 
    9191 
    92 trigger_action('loc_begin_comments'); 
     92trigger_notify('loc_begin_comments'); 
    9393 
    9494if (!empty($_GET['since']) && is_numeric($_GET['since'])) 
     
    484484      'src_image' => $src_image, 
    485485      'ALT' => $name, 
    486       'AUTHOR' => trigger_event('render_comment_author', $comment['author']), 
     486      'AUTHOR' => trigger_change('render_comment_author', $comment['author']), 
    487487      'WEBSITE_URL' => $comment['website_url'], 
    488488      'DATE'=>format_date($comment['date'], true), 
    489       'CONTENT'=>trigger_event('render_comment_content',$comment['content']), 
     489      'CONTENT'=>trigger_change('render_comment_content',$comment['content']), 
    490490      ); 
    491491 
     
    544544} 
    545545 
    546 $derivative_params = trigger_event('get_comments_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) ); 
     546$derivative_params = trigger_change('get_comments_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) ); 
    547547$template->assign( 'derivative_params', $derivative_params ); 
    548548 
     
    558558// +-----------------------------------------------------------------------+ 
    559559include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    560 trigger_action('loc_end_comments'); 
     560trigger_notify('loc_end_comments'); 
    561561flush_page_messages(); 
    562562$template->pparse('comments'); 
  • trunk/i.php

    r28198 r28587  
    3232 
    3333 
    34 function trigger_action() {} 
     34function trigger_notify() {} 
    3535function get_extension( $filename ) 
    3636{ 
  • trunk/identification.php

    r26461 r28587  
    3131check_status(ACCESS_FREE); 
    3232 
    33 trigger_action('loc_begin_identification'); 
     33trigger_notify('loc_begin_identification'); 
    3434 
    3535//-------------------------------------------------------------- identification 
     
    107107//----------------------------------------------------------- html code display 
    108108include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    109 trigger_action('loc_end_identification'); 
     109trigger_notify('loc_end_identification'); 
    110110flush_page_messages(); 
    111111$template->pparse('identification'); 
  • trunk/include/block.class.php

    r27370 r28587  
    5050  public function load_registered_blocks() 
    5151  { 
    52     trigger_action('blockmanager_register_blocks', array($this)); 
     52    trigger_notify('blockmanager_register_blocks', array($this)); 
    5353  } 
    5454   
     
    111111    } 
    112112    $this->sort_blocks(); 
    113     trigger_action('blockmanager_prepare_display', array($this)); 
     113    trigger_notify('blockmanager_prepare_display', array($this)); 
    114114    $this->sort_blocks(); 
    115115  } 
     
    192192 
    193193    $template->set_filename('menubar', $file); 
    194     trigger_action('blockmanager_apply', array($this) ); 
     194    trigger_notify('blockmanager_apply', array($this) ); 
    195195 
    196196    foreach ($this->display_blocks as $id=>$block) 
  • trunk/include/category_cats.inc.php

    r27336 r28587  
    270270  $template->set_filename('index_category_thumbnails', 'mainpage_categories.tpl'); 
    271271 
    272   trigger_action('loc_begin_index_category_thumbnails', $categories); 
     272  trigger_notify('loc_begin_index_category_thumbnails', $categories); 
    273273 
    274274  $tpl_thumbnails_var = array(); 
     
    281281    } 
    282282 
    283     $category['name'] = trigger_event( 
     283    $category['name'] = trigger_change( 
    284284        'render_category_name', 
    285285        $category['name'], 
     
    317317                                  ), 
    318318          'DESCRIPTION' => 
    319             trigger_event('render_category_literal_description', 
    320               trigger_event('render_category_description', 
     319            trigger_change('render_category_literal_description', 
     320              trigger_change('render_category_description', 
    321321                @$category['comment'], 
    322322                'subcatify_category_description')), 
     
    368368    ); 
    369369 
    370   $derivative_params = trigger_event('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) ); 
    371   $tpl_thumbnails_var_selection = trigger_event('loc_end_index_category_thumbnails', $tpl_thumbnails_var_selection); 
     370  $derivative_params = trigger_change('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) ); 
     371  $tpl_thumbnails_var_selection = trigger_change('loc_end_index_category_thumbnails', $tpl_thumbnails_var_selection); 
    372372  $template->assign( array( 
    373373    'maxRequests' =>$conf['max_requests'], 
  • trunk/include/category_default.inc.php

    r27369 r28587  
    3636  ); 
    3737 
    38 $selection = trigger_event('loc_index_thumbnails_selection', $selection); 
     38$selection = trigger_change('loc_index_thumbnails_selection', $selection); 
    3939 
    4040if (count($selection) > 0) 
     
    9292$template->set_filenames( array( 'index_thumbnails' => 'thumbnails.tpl',)); 
    9393 
    94 trigger_action('loc_begin_index_thumbnails', $pictures); 
     94trigger_notify('loc_begin_index_thumbnails', $pictures); 
    9595$tpl_thumbnails_var = array(); 
    9696 
     
    153153 
    154154$template->assign( array( 
    155   'derivative_params' => trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) ), 
     155  'derivative_params' => trigger_change('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) ), 
    156156  'maxRequests' =>$conf['max_requests'], 
    157157  'SHOW_THUMBNAIL_CAPTION' =>$conf['show_thumbnail_caption'], 
    158158    ) ); 
    159 $tpl_thumbnails_var = trigger_event('loc_end_index_thumbnails', $tpl_thumbnails_var, $pictures); 
     159$tpl_thumbnails_var = trigger_change('loc_end_index_thumbnails', $tpl_thumbnails_var, $pictures); 
    160160$template->assign('thumbnails', $tpl_thumbnails_var); 
    161161 
  • trunk/include/common.inc.php

    r28432 r28587  
    176176  load_language('admin.lang'); 
    177177} 
    178 trigger_action('loading_lang'); 
     178trigger_notify('loading_lang'); 
    179179load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) ); 
    180180 
     
    273273  add_event_handler('get_src_image_url', 'get_src_image_url_protection_handler', EVENT_HANDLER_PRIORITY_NEUTRAL, 2 ); 
    274274} 
    275 trigger_action('init'); 
     275trigger_notify('init'); 
    276276?> 
  • trunk/include/derivative.inc.php

    r26461 r28587  
    6868    { 
    6969      $ext = strtolower($ext); 
    70       $this->rel_path = trigger_event('get_mimetype_location', get_themeconf('mime_icon_dir').$ext.'.png', $ext ); 
     70      $this->rel_path = trigger_change('get_mimetype_location', get_themeconf('mime_icon_dir').$ext.'.png', $ext ); 
    7171      $this->flags |= self::IS_MIMETYPE; 
    7272      if ( ($size=@getimagesize(PHPWG_ROOT_PATH.$this->rel_path)) === false) 
     
    135135    if ( !($this->flags & self::IS_MIMETYPE) ) 
    136136    { 
    137       $url = trigger_event('get_src_image_url', $url, $this); 
     137      $url = trigger_change('get_src_image_url', $url, $this); 
    138138    } 
    139139    return embellish_url($url); 
     
    236236    } 
    237237    return embellish_url( 
    238         trigger_event('get_derivative_url', 
     238        trigger_change('get_derivative_url', 
    239239          get_root_url().$rel_url, 
    240240          $params, $src_image, $rel_url 
     
    406406    } 
    407407    return embellish_url( 
    408         trigger_event('get_derivative_url', 
     408        trigger_change('get_derivative_url', 
    409409          get_root_url().$this->rel_url, 
    410410          $this->params, $this->src_image, $this->rel_url 
  • trunk/include/functions.inc.php

    r28579 r28587  
    424424  } 
    425425 
    426   $do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type); 
     426  $do_log = trigger_change('pwg_log_allowed', $do_log, $image_id, $image_type); 
    427427 
    428428  if (!$do_log) 
     
    774774    $user = build_user( $conf['guest_id'], true); 
    775775    load_language('common.lang'); 
    776     trigger_action('loading_lang'); 
     776    trigger_notify('loading_lang'); 
    777777    load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) ); 
    778778    $template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme()); 
     
    871871 
    872872  // plugins want remove some themes based on user status maybe? 
    873   $themes = trigger_event('get_pwg_themes', $themes); 
     873  $themes = trigger_change('get_pwg_themes', $themes); 
    874874 
    875875  return $themes; 
     
    11131113  list($email) = pwg_db_fetch_row(pwg_query($query)); 
    11141114 
    1115   $email = trigger_event('get_webmaster_mail_address', $email); 
     1115  $email = trigger_change('get_webmaster_mail_address', $email); 
    11161116 
    11171117  return $email; 
     
    11551155  } 
    11561156 
    1157   trigger_action('load_conf', $condition); 
     1157  trigger_notify('load_conf', $condition); 
    11581158} 
    11591159 
  • trunk/include/functions_category.inc.php

    r27926 r28587  
    109109  } 
    110110 
    111   $where = trigger_event('get_categories_menu_sql_where', 
     111  $where = trigger_change('get_categories_menu_sql_where', 
    112112    $where, $user['expand'], $filter['enabled'] ); 
    113113 
     
    124124    $row = array_merge($row, 
    125125      array( 
    126         'NAME' => trigger_event( 
     126        'NAME' => trigger_change( 
    127127          'render_category_name', 
    128128          $row['name'], 
     
    231231  global $conf, $page; 
    232232 
    233   return trigger_event('get_category_preferred_image_orders', array( 
     233  return trigger_change('get_category_preferred_image_orders', array( 
    234234    array(l10n('Default'),                        '',                     true), 
    235235    array(l10n('Photo title, A &rarr; Z'),        'name ASC',             true), 
     
    280280      $option.= '- '; 
    281281      $option.= strip_tags( 
    282         trigger_event( 
     282        trigger_change( 
    283283          'render_category_name', 
    284284          $category['name'], 
  • trunk/include/functions_comment.inc.php

    r26916 r28587  
    3232/** 
    3333 * Does basic check on comment and returns action to perform. 
    34  * This method is called by a trigger_event() 
     34 * This method is called by a trigger_change() 
    3535 * 
    3636 * @param string $action before check 
     
    212212 
    213213  // perform more spam check 
    214   $comment_action = trigger_event('user_comment_check', 
     214  $comment_action = trigger_change('user_comment_check', 
    215215      $comment_action, $comm 
    216216    ); 
     
    304304                      'comment_id' => $comment_id 
    305305                  )); 
    306     trigger_action('user_comment_deletion', $comment_id); 
     306    trigger_notify('user_comment_deletion', $comment_id); 
    307307 
    308308    return true; 
     
    343343  // perform more spam check 
    344344  $comment_action = 
    345     trigger_event('user_comment_check', 
     345    trigger_change('user_comment_check', 
    346346                  $comment_action, 
    347347                  array_merge($comment, 
     
    510510   
    511511  invalidate_user_cache_nb_comments(); 
    512   trigger_action('user_comment_validation', $comment_id); 
     512  trigger_notify('user_comment_validation', $comment_id); 
    513513} 
    514514 
  • trunk/include/functions_html.inc.php

    r27369 r28587  
    5252      ); 
    5353 
    54     $cat['name'] = trigger_event( 
     54    $cat['name'] = trigger_change( 
    5555      'render_category_name', 
    5656      $cat['name'], 
     
    133133    $cat = $cache['cat_names'][$category_id]; 
    134134 
    135     $cat['name'] = trigger_event( 
     135    $cat['name'] = trigger_change( 
    136136      'render_category_name', 
    137137      $cat['name'], 
     
    464464      .l10n('display photos linked to this tag') 
    465465      .'">' 
    466       .trigger_event('render_tag_name', $page['tags'][$i]['name'], $page['tags'][$i]) 
     466      .trigger_change('render_tag_name', $page['tags'][$i]['name'], $page['tags'][$i]) 
    467467      .'</a>'; 
    468468 
     
    518518 
    519519  header( "$protocol $code $text", true, $code ); 
    520   trigger_action('set_status_header', $code, $text); 
     520  trigger_notify('set_status_header', $code, $text); 
    521521} 
    522522 
    523523/** 
    524524 * Returns the category comment for rendering in html textual mode (subcatify) 
    525  * This method is called by a trigger_action() 
     525 * This method is called by a trigger_notify() 
    526526 * 
    527527 * @param string $desc 
     
    535535/** 
    536536 * Add known menubar blocks. 
    537  * This method is called by a trigger_event() 
     537 * This method is called by a trigger_change() 
    538538 * 
    539539 * @param BlockManager[] $menu_ref_arr 
     
    563563  if (!empty($info['name'])) 
    564564  { 
    565     return trigger_event('render_element_name', $info['name']); 
     565    return trigger_change('render_element_name', $info['name']); 
    566566  } 
    567567  return get_name_from_file($info['file']); 
     
    579579  if (!empty($info['comment'])) 
    580580  { 
    581     return trigger_event('render_element_description', $info['comment'], $param); 
     581    return trigger_change('render_element_description', $info['comment'], $param); 
    582582  } 
    583583  return ''; 
     
    625625 
    626626  $title = htmlspecialchars(strip_tags($title)); 
    627   $title = trigger_event('get_thumbnail_title', $title, $info); 
     627  $title = trigger_change('get_thumbnail_title', $title, $info); 
    628628 
    629629  return $title; 
  • trunk/include/functions_mail.inc.php

    r28185 r28587  
    313313    } 
    314314     
    315     trigger_action('loading_lang'); 
     315    trigger_notify('loading_lang'); 
    316316    load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, 
    317317      array('language'=>$language, 'no_fallback'=>true, 'local'=>true) 
     
    697697      { 
    698698        $conf_mail[$cache_key]['theme'] = get_mail_template($content_type); 
    699         trigger_action('before_parse_mail_template', $cache_key, $content_type); 
     699        trigger_notify('before_parse_mail_template', $cache_key, $content_type); 
    700700      } 
    701701      $template = &$conf_mail[$cache_key]['theme']; 
     
    855855 
    856856  $ret = true; 
    857   $pre_result = trigger_event('before_send_mail', true, $to, $args, $mail); 
     857  $pre_result = trigger_change('before_send_mail', true, $to, $args, $mail); 
    858858 
    859859  if ($pre_result) 
     
    946946} 
    947947 
    948 trigger_action('functions_mail_included'); 
     948trigger_notify('functions_mail_included'); 
    949949 
    950950?> 
  • trunk/include/functions_metadata.inc.php

    r28089 r28587  
    105105    // apparently mac uses some MacRoman crap encoding. I don't know 
    106106    // how to detect it so a plugin should do the trick. 
    107     $value = trigger_event('clean_iptc_value', $value); 
     107    $value = trigger_change('clean_iptc_value', $value); 
    108108    if ( ($qual = qualify_utf8($value)) != 0) 
    109109    {// has non ascii chars 
     
    153153  if ($exif = @read_exif_data($filename)) 
    154154  { 
    155     $exif = trigger_event('format_exif_data', $exif, $filename, $map); 
     155    $exif = trigger_change('format_exif_data', $exif, $filename, $map); 
    156156 
    157157    // configured fields 
  • trunk/include/functions_plugins.inc.php

    r27335 r28587  
    247247 * 
    248248 * @since 2.6 
    249  * @todo remove trigger_event() 
    250249 * 
    251250 * @param string $event 
     
    256255function trigger_change($event, $data=null) 
    257256{ 
    258   $args = func_get_args(); 
    259   return call_user_func_array('trigger_event', $args); 
    260 } 
    261  
    262 /** 
    263  * @deprecated 2.6 
    264  * @see trigger_change 
    265  */ 
    266 function trigger_event($event, $data=null) 
    267 { 
    268257  global $pwg_event_handlers; 
    269258 
    270259  if (isset($pwg_event_handlers['trigger'])) 
    271260  {// debugging 
    272     trigger_action('trigger', 
     261    trigger_notify('trigger', 
    273262      array('type'=>'event', 'event'=>$event, 'data'=>$data) 
    274263      ); 
     
    299288  if (isset($pwg_event_handlers['trigger'])) 
    300289  {// debugging 
    301     trigger_action('trigger', 
     290    trigger_notify('trigger', 
    302291      array('type'=>'post_event', 'event'=>$event, 'data'=>$data) 
    303292      ); 
     
    312301 * 
    313302 * @since 2.6 
    314  * @todo remove trigger_action() 
    315303 * 
    316304 * @param string $event 
     
    319307function trigger_notify($event) 
    320308{ 
    321   $args = func_get_args(); 
    322   return call_user_func_array('trigger_action', $args); 
    323 } 
    324  
    325 /** 
    326  * @deprecated 2.6 
    327  * @see trigger_notify 
    328  */ 
    329 function trigger_action($event) 
    330 { 
    331309  global $pwg_event_handlers; 
    332310 
    333311  if (isset($pwg_event_handlers['trigger']) and $event!='trigger') 
    334312  {// debugging - avoid recursive calls 
    335     trigger_action('trigger', 
     313    trigger_notify('trigger', 
    336314      array('type'=>'action', 'event'=>$event, 'data'=>null) 
    337315      ); 
     
    456434      load_plugin($plugin); 
    457435    } 
    458     trigger_action('plugins_loaded'); 
     436    trigger_notify('plugins_loaded'); 
    459437  } 
    460438} 
  • trunk/include/functions_rate.inc.php

    r27294 r28587  
    137137function update_rating_score($element_id = false) 
    138138{ 
    139   if ( ($alt_result = trigger_event('update_rating_score', false, $element_id)) !== false) 
     139  if ( ($alt_result = trigger_change('update_rating_score', false, $element_id)) !== false) 
    140140  { 
    141141    return $alt_result; 
  • trunk/include/functions_search.inc.php

    r28579 r28587  
    929929      default: 
    930930        // allow plugins to have their own scope with columns added in db by themselves 
    931         $clauses = trigger_event('qsearch_get_images_sql_scopes', $clauses, $token, $expr); 
     931        $clauses = trigger_change('qsearch_get_images_sql_scopes', $clauses, $token, $expr); 
    932932        break; 
    933933    } 
     
    10201020  foreach ( $all_tags as &$tag ) 
    10211021  { 
    1022     $tag['name'] = trigger_event('render_tag_name', $tag['name'], $tag); 
     1022    $tag['name'] = trigger_change('render_tag_name', $tag['name'], $tag); 
    10231023  } 
    10241024  $qsr->all_tags = $all_tags; 
     
    11521152 
    11531153  // allow plugins to add their own scopes 
    1154   $scopes = trigger_event('qsearch_get_scopes', $scopes); 
     1154  $scopes = trigger_change('qsearch_get_scopes', $scopes); 
    11551155  $expression = new QExpression($q, $scopes); 
    11561156 
     
    11771177 
    11781178 
    1179   trigger_action('qsearch_expression_parsed', $expression); 
     1179  trigger_notify('qsearch_expression_parsed', $expression); 
    11801180//var_export($expression); 
    11811181 
     
    11891189 
    11901190  // allow plugins to evaluate their own scopes 
    1191   trigger_action('qsearch_before_eval', $expression, $qsr); 
     1191  trigger_notify('qsearch_before_eval', $expression, $qsr); 
    11921192 
    11931193  $ids = qsearch_eval($expression, $qsr, $tmp, $search_results['qs']['unmatched_terms']); 
  • trunk/include/functions_tag.inc.php

    r27336 r28587  
    9090    { 
    9191      $row['counter'] = $counter; 
    92       $row['name'] = trigger_event('render_tag_name', $row['name'], $row); 
     92      $row['name'] = trigger_change('render_tag_name', $row['name'], $row); 
    9393      $tags[] = $row; 
    9494    } 
     
    112112  while ($row = pwg_db_fetch_assoc($result)) 
    113113  { 
    114     $row['name'] = trigger_event('render_tag_name', $row['name'], $row); 
     114    $row['name'] = trigger_change('render_tag_name', $row['name'], $row); 
    115115    $tags[] = $row; 
    116116  } 
     
    278278  while($row = pwg_db_fetch_assoc($result)) 
    279279  { 
    280     $row['name'] = trigger_event('render_tag_name', $row['name'], $row); 
     280    $row['name'] = trigger_change('render_tag_name', $row['name'], $row); 
    281281    $tags[] = $row; 
    282282  } 
  • trunk/include/functions_user.inc.php

    r27388 r28587  
    175175  } 
    176176 
    177   $errors = trigger_event( 
     177  $errors = trigger_change( 
    178178    'register_user_check', 
    179179    $errors, 
     
    274274    } 
    275275 
    276     trigger_action( 
     276    trigger_notify( 
    277277      'register_user', 
    278278      array( 
     
    960960 
    961961  $user['id'] = $_SESSION['pwg_uid']; 
    962   trigger_action('user_login', $user['id']); 
     962  trigger_notify('user_login', $user['id']); 
    963963} 
    964964 
     
    985985      { 
    986986        log_user($cookie[0], true); 
    987         trigger_action('login_success', stripslashes($username)); 
     987        trigger_notify('login_success', stripslashes($username)); 
    988988        return true; 
    989989      } 
     
    10861086function try_log_user($username, $password, $remember_me) 
    10871087{ 
    1088   return trigger_event('try_log_user', false, $username, $password, $remember_me); 
     1088  return trigger_change('try_log_user', false, $username, $password, $remember_me); 
    10891089} 
    10901090 
     
    11221122  { 
    11231123    log_user($row['id'], $remember_me); 
    1124     trigger_action('login_success', stripslashes($username)); 
     1124    trigger_notify('login_success', stripslashes($username)); 
    11251125    return true; 
    11261126  } 
    1127   trigger_action('login_failure', stripslashes($username)); 
     1127  trigger_notify('login_failure', stripslashes($username)); 
    11281128  return false; 
    11291129} 
     
    11361136  global $conf; 
    11371137 
    1138   trigger_action('user_logout', @$_SESSION['pwg_uid']); 
     1138  trigger_notify('user_logout', @$_SESSION['pwg_uid']); 
    11391139 
    11401140  $_SESSION = array(); 
  • trunk/include/no_photo_yet.inc.php

    r28101 r28587  
    9898    } 
    9999 
    100     trigger_action('loc_end_no_photo_yet'); 
     100    trigger_notify('loc_end_no_photo_yet'); 
    101101 
    102102    $template->pparse('no_photo_yet'); 
  • trunk/include/page_header.php

    r26461 r28587  
    2727$template->set_filenames(array('header'=>'header.tpl')); 
    2828 
    29 trigger_action('loc_begin_page_header'); 
     29trigger_notify('loc_begin_page_header'); 
    3030 
    3131$template->assign( 
     
    3636 
    3737    'PAGE_BANNER' => 
    38       trigger_event( 
     38      trigger_change( 
    3939        'render_page_banner', 
    4040        str_replace( 
     
    9797} 
    9898 
    99 trigger_action('loc_end_page_header'); 
     99trigger_notify('loc_end_page_header'); 
    100100 
    101101header('Content-Type: text/html; charset='.get_pwg_charset()); 
    102102$template->parse('header'); 
    103103 
    104 trigger_action('loc_after_page_header'); 
     104trigger_notify('loc_after_page_header'); 
    105105?> 
  • trunk/include/page_tail.php

    r26461 r28587  
    2323$template->set_filenames(array('tail'=>'footer.tpl')); 
    2424 
    25 trigger_action('loc_begin_page_tail'); 
     25trigger_notify('loc_begin_page_tail'); 
    2626 
    2727$template->assign( 
     
    7777} 
    7878 
    79 trigger_action('loc_end_page_tail'); 
     79trigger_notify('loc_end_page_tail'); 
    8080// 
    8181// Generate the page 
  • trunk/include/picture_comment.inc.php

    r28183 r28587  
    7474 
    7575  // allow plugins to notify what's going on 
    76   trigger_action( 'user_comment_insertion', 
     76  trigger_notify( 'user_comment_insertion', 
    7777      array_merge($comm, array('action'=>$comment_action) ) 
    7878    ); 
     
    182182        array( 
    183183          'ID' => $row['id'], 
    184           'AUTHOR' => trigger_event('render_comment_author', $row['author']), 
     184          'AUTHOR' => trigger_change('render_comment_author', $row['author']), 
    185185          'DATE' => format_date($row['date'], true), 
    186           'CONTENT' => trigger_event('render_comment_content',$row['content']), 
     186          'CONTENT' => trigger_change('render_comment_content',$row['content']), 
    187187          'WEBSITE_URL' => $row['website_url'], 
    188188        ); 
  • trunk/include/section_init.inc.php

    r28432 r28587  
    232232      $page, 
    233233      array( 
    234         'comment' => trigger_event( 
     234        'comment' => trigger_change( 
    235235            'render_category_description', 
    236236            $page['category']['comment'], 
     
    638638} 
    639639 
    640 trigger_action('loc_end_section_init'); 
     640trigger_notify('loc_end_section_init'); 
    641641?> 
  • trunk/include/template.class.php

    r27184 r28587  
    522522        $href .= '?v' . ($combi->version ? $combi->version : PHPWG_VERSION); 
    523523      // trigger the event for eventual use of a cdn 
    524       $href = trigger_event('combined_css', $href, $combi); 
     524      $href = trigger_change('combined_css', $href, $combi); 
    525525      $content[] = '<link rel="stylesheet" type="text/css" href="'.$href.'">'; 
    526526    } 
     
    879879    } 
    880880    // trigger the event for eventual use of a cdn 
    881     $ret = trigger_event('combined_script', $ret, $script); 
     881    $ret = trigger_change('combined_script', $ret, $script); 
    882882    return embellish_url($ret); 
    883883  } 
     
    19351935      $handle = $this->type. '.' .$combinable->id; 
    19361936      $template->set_filename($handle, realpath(PHPWG_ROOT_PATH.$combinable->path)); 
    1937       trigger_action( 'combinable_preparse', $template, $combinable, $this); //allow themes and plugins to set their own vars to template ... 
     1937      trigger_notify( 'combinable_preparse', $template, $combinable, $this); //allow themes and plugins to set their own vars to template ... 
    19381938      $content = $template->parse($handle, true); 
    19391939 
     
    19911991      $css = CssMin::minify($css, array('Variables'=>false)); 
    19921992    } 
    1993     $css = trigger_event('combined_css_postfilter', $css); 
     1993    $css = trigger_change('combined_css_postfilter', $css); 
    19941994    return $css; 
    19951995  } 
  • trunk/include/user.inc.php

    r26461 r28587  
    7373  get_browser_language($user['language']); 
    7474} 
    75 trigger_action('user_init', $user); 
     75trigger_notify('user_init', $user); 
    7676?> 
  • trunk/include/ws_core.inc.php

    r26461 r28587  
    292292        ); 
    293293 
    294     trigger_action('ws_add_methods', array(&$this) ); 
     294    trigger_notify('ws_add_methods', array(&$this) ); 
    295295    uksort( $this->_methods, 'strnatcmp' ); 
    296296    $this->_requestHandler->handleRequest($this); 
     
    307307    @header('Content-Type: '.$contentType.'; charset='.get_pwg_charset()); 
    308308    print_r($encodedResponse); 
    309     trigger_action('sendResponse', $encodedResponse ); 
     309    trigger_notify('sendResponse', $encodedResponse ); 
    310310  } 
    311311 
     
    599599    } 
    600600     
    601     $result = trigger_event('ws_invoke_allowed', true, $methodName, $params); 
     601    $result = trigger_change('ws_invoke_allowed', true, $methodName, $params); 
    602602    if ( strtolower( @get_class($result) )!='pwgerror') 
    603603    { 
  • trunk/include/ws_functions/pwg.categories.php

    r28542 r28587  
    265265    { 
    266266      $row['name'] = strip_tags( 
    267         trigger_event( 
     267        trigger_change( 
    268268          'render_category_name', 
    269269          $row['name'], 
     
    274274 
    275275    $row['comment'] = strip_tags( 
    276       trigger_event( 
     276      trigger_change( 
    277277        'render_category_description', 
    278278        $row['comment'], 
     
    502502 
    503503    $row['name'] = strip_tags( 
    504       trigger_event( 
     504      trigger_change( 
    505505        'render_category_name', 
    506506        $row['name'], 
     
    515515      ); 
    516516    $row['comment'] = strip_tags( 
    517       trigger_event( 
     517      trigger_change( 
    518518        'render_category_description', 
    519519        $row['comment'], 
     
    788788    { 
    789789      $row['name'] = strip_tags( 
    790         trigger_event( 
     790        trigger_change( 
    791791          'render_category_name', 
    792792          $row['name'], 
  • trunk/index.php

    r28316 r28587  
    4141} 
    4242 
    43 trigger_action('loc_begin_index'); 
     43trigger_notify('loc_begin_index'); 
    4444 
    4545//---------------------------------------------- change of image display order 
     
    362362//------------------------------------------------------------ end 
    363363include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    364 trigger_action('loc_end_index'); 
     364trigger_notify('loc_end_index'); 
    365365flush_page_messages(); 
    366366$template->parse_index_buttons(); 
  • trunk/nbm.php

    r26461 r28587  
    3434load_language('admin.lang'); 
    3535// Need to update a second time 
    36 trigger_action('loading_lang'); 
     36trigger_notify('loading_lang'); 
    3737load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) ); 
    3838 
  • trunk/notification.php

    r26461 r28587  
    5757check_status(ACCESS_GUEST); 
    5858 
    59 trigger_action('loc_begin_notification'); 
     59trigger_notify('loc_begin_notification'); 
    6060 
    6161// +-----------------------------------------------------------------------+ 
     
    115115// +-----------------------------------------------------------------------+ 
    116116include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    117 trigger_action('loc_end_notification'); 
     117trigger_notify('loc_end_notification'); 
    118118flush_page_messages(); 
    119119$template->pparse('notification'); 
  • trunk/password.php

    r26461 r28587  
    3636check_status(ACCESS_FREE); 
    3737 
    38 trigger_action('loc_begin_password'); 
     38trigger_notify('loc_begin_password'); 
    3939 
    4040// +-----------------------------------------------------------------------+ 
     
    118118  unset_make_full_url(); 
    119119 
    120   $message = trigger_event('render_lost_password_mail_content', $message); 
     120  $message = trigger_change('render_lost_password_mail_content', $message); 
    121121 
    122122  $email_params = array( 
     
    354354 
    355355include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    356 trigger_action('loc_end_password'); 
     356trigger_notify('loc_end_password'); 
    357357flush_page_messages(); 
    358358$template->pparse('password'); 
  • trunk/picture.php

    r28184 r28587  
    145145add_event_handler('render_element_description', 'nl2br'); 
    146146 
    147 trigger_action('loc_begin_picture'); 
     147trigger_notify('loc_begin_picture'); 
    148148 
    149149// this is the default handler that generates the display for the element 
     
    435435 
    436436// don't increment if adding a comment 
    437 if (trigger_event('allow_increment_element_hit_count', $inc_hit_count, $page['image_id'] ) ) 
     437if (trigger_change('allow_increment_element_hit_count', $inc_hit_count, $page['image_id'] ) ) 
    438438{ 
    439439  $query = ' 
     
    615615 
    616616// do we have a plugin that can show metadata for something else than images? 
    617 $metadata_showable = trigger_event( 
     617$metadata_showable = trigger_change( 
    618618  'get_element_metadata_available', 
    619619  ( 
     
    633633 
    634634// allow plugins to change what we computed before passing data to template 
    635 $picture = trigger_event('picture_pictures_data', $picture); 
     635$picture = trigger_change('picture_pictures_data', $picture); 
    636636 
    637637//------------------------------------------------------- navigation management 
     
    809809  $template->assign( 
    810810      'COMMENT_IMG', 
    811         trigger_event('render_element_description', 
     811        trigger_change('render_element_description', 
    812812          $picture['current']['comment'], 
    813813          'picture_page_element_description' 
     
    938938// maybe someone wants a special display (call it before page_header so that 
    939939// they can add stylesheets) 
    940 $element_content = trigger_event( 
     940$element_content = trigger_change( 
    941941  'render_element_content', 
    942942  '', 
     
    988988 
    989989include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    990 trigger_action('loc_end_picture'); 
     990trigger_notify('loc_end_picture'); 
    991991flush_page_messages(); 
    992992if ($page['slideshow'] and $conf['light_slideshow']) 
  • trunk/popuphelp.php

    r26461 r28587  
    5555  } 
    5656 
    57   $help_content = trigger_event( 
     57  $help_content = trigger_change( 
    5858    'get_popup_help_content', $help_content, $_GET['page']); 
    5959} 
  • trunk/profile.php

    r26461 r28587  
    4444  $userdata = $user; 
    4545 
    46   trigger_action('loc_begin_profile'); 
     46  trigger_notify('loc_begin_profile'); 
    4747 
    4848// Reset to default (Guest) custom settings 
     
    8585   
    8686  include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    87   trigger_action('loc_end_profile'); 
     87  trigger_notify('loc_end_profile'); 
    8888  flush_page_messages(); 
    8989  $template->pparse('profile'); 
     
    280280                   array($data)); 
    281281    } 
    282     trigger_action( 'save_profile_from_post', $userdata['id'] ); 
     282    trigger_notify( 'save_profile_from_post', $userdata['id'] ); 
    283283 
    284284    if (!empty($_POST['redirect'])) 
     
    336336 
    337337  // allow plugins to add their own form data to content 
    338   trigger_action( 'load_profile_in_template', $userdata ); 
     338  trigger_notify( 'load_profile_in_template', $userdata ); 
    339339 
    340340  $template->assign('PWG_TOKEN', get_pwg_token()); 
  • trunk/register.php

    r26461 r28587  
    3838} 
    3939 
    40 trigger_action('loc_begin_register'); 
     40trigger_notify('loc_begin_register'); 
    4141 
    4242if (isset($_POST['submit'])) 
     
    118118 
    119119include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    120 trigger_action('loc_end_register'); 
     120trigger_notify('loc_end_register'); 
    121121flush_page_messages(); 
    122122$template->parse('register'); 
  • trunk/search.php

    r26825 r28587  
    3131check_status(ACCESS_GUEST); 
    3232 
    33 trigger_action('loc_begin_search'); 
     33trigger_notify('loc_begin_search'); 
    3434 
    3535//------------------------------------------------------------------ form check 
     
    237237//------------------------------------------------------------ html code display 
    238238include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    239 trigger_action('loc_end_search'); 
     239trigger_notify('loc_end_search'); 
    240240flush_page_messages(); 
    241241$template->pparse('search'); 
  • trunk/tags.php

    r26461 r28587  
    5050check_status(ACCESS_GUEST); 
    5151 
    52 trigger_action('loc_begin_tags'); 
     52trigger_notify('loc_begin_tags'); 
    5353 
    5454// +-----------------------------------------------------------------------+ 
     
    196196 
    197197include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    198 trigger_action('loc_end_tags'); 
     198trigger_notify('loc_end_tags'); 
    199199flush_page_messages(); 
    200200$template->pparse('tags'); 
  • trunk/tools/triggers_list.php

    r28166 r28587  
    33array( 
    44  'name' => 'allow_increment_element_hit_count', 
    5   'type' => 'trigger_event', 
     5  'type' => 'trigger_change', 
    66  'vars' => array('bool', 'content_not_set'), 
    77  'files' => array('picture.php'), 
     
    99array( 
    1010  'name' => 'begin_delete_elements', 
    11   'type' => 'trigger_action', 
     11  'type' => 'trigger_notify', 
    1212  'vars' => array('array', 'ids'), 
    1313  'files' => array('admin\include\functions.inc.php (delete_elements)'), 
     
    1515array( 
    1616  'name' => 'blockmanager_apply', 
    17   'type' => 'trigger_action', 
     17  'type' => 'trigger_notify', 
    1818  'vars' => array('object', 'menublock'), 
    1919  'files' => array('include\block.class.php (BlockManager::apply)'), 
     
    2222array( 
    2323  'name' => 'blockmanager_prepare_display', 
    24   'type' => 'trigger_action', 
     24  'type' => 'trigger_notify', 
    2525  'vars' => array('object', 'this'), 
    2626  'files' => array('include\block.class.php (BlockManager::prepare_display)'), 
     
    2828array( 
    2929  'name' => 'blockmanager_register_blocks', 
    30   'type' => 'trigger_action', 
     30  'type' => 'trigger_notify', 
    3131  'vars' => array('object', 'menu'), 
    3232  'files' => array('include\block.class.php (BlockManager::load_registered_blocks)'), 
     
    3535array( 
    3636  'name' => 'clean_iptc_value', 
    37   'type' => 'trigger_event', 
     37  'type' => 'trigger_change', 
    3838  'vars' => array('string', 'value'), 
    3939  'files' => array('include\functions_metadata.inc.php (clean_iptc_value)'), 
     
    4141array( 
    4242  'name' => 'combined_css', 
    43   'type' => 'trigger_event', 
     43  'type' => 'trigger_change', 
    4444  'vars' => array('string', 'href', 'Combinable', '$combinable'), 
    4545  'files' => array('include\template.class.php (Template::flush)'), 
     
    4747array( 
    4848  'name' => 'combined_css_postfilter', 
    49   'type' => 'trigger_event', 
     49  'type' => 'trigger_change', 
    5050  'vars' => array('string', 'css'), 
    5151  'files' => array('include\template.class.php (Template::process_css)'), 
     
    5353array( 
    5454  'name' => 'combined_script', 
    55   'type' => 'trigger_event', 
     55  'type' => 'trigger_change', 
    5656  'vars' => array('string', 'ret', 'string', 'script'), 
    5757  'files' => array('include\template.class.php (Template::make_script_src)'), 
     
    5959array( 
    6060  'name' => 'delete_categories', 
    61   'type' => 'trigger_action', 
     61  'type' => 'trigger_notify', 
    6262  'vars' => array('array', 'ids'), 
    6363  'files' => array('admin\include\functions.inc.php (delete_categories)'), 
     
    6565array( 
    6666  'name' => 'delete_elements', 
    67   'type' => 'trigger_action', 
     67  'type' => 'trigger_notify', 
    6868  'vars' => array('array', 'ids'), 
    6969  'files' => array('admin\include\functions.inc.php (delete_elements)'), 
     
    7171array( 
    7272  'name' => 'delete_user', 
    73   'type' => 'trigger_action', 
     73  'type' => 'trigger_notify', 
    7474  'vars' => array('int', 'user_id'), 
    7575  'files' => array('admin\include\functions.inc.php (delete_user)'), 
     
    7777array( 
    7878  'name' => 'element_set_global_action', 
    79   'type' => 'trigger_action', 
     79  'type' => 'trigger_notify', 
    8080  'vars' => array('string', 'action', 'array', 'collection'), 
    8181  'files' => array('admin\batch_manager_global.php'), 
     
    8383array( 
    8484  'name' => 'format_exif_data', 
    85   'type' => 'trigger_event', 
     85  'type' => 'trigger_change', 
    8686  'vars' => array('array', 'exif', 'string', 'filename', 'array', 'map'), 
    8787  'files' => array('include\functions_metadata.inc.php (get_exif_data)'), 
     
    8989array( 
    9090  'name' => 'functions_history_included', 
    91   'type' => 'trigger_action', 
     91  'type' => 'trigger_notify', 
    9292  'vars' => array(), 
    9393  'files' => array('admin\include\functions_history.inc.php'), 
     
    9595array( 
    9696  'name' => 'functions_mail_included', 
    97   'type' => 'trigger_action', 
     97  'type' => 'trigger_notify', 
    9898  'vars' => array(), 
    9999  'files' => array('include\functions_mail.inc.php'), 
     
    101101array( 
    102102  'name' => 'get_admin_advanced_features_links', 
    103   'type' => 'trigger_event', 
     103  'type' => 'trigger_change', 
    104104  'vars' => array('array', 'advanced_features'), 
    105105  'files' => array('admin\maintenance.php'), 
     
    107107array( 
    108108  'name' => 'get_admin_plugin_menu_links', 
    109   'type' => 'trigger_event', 
     109  'type' => 'trigger_change', 
    110110  'vars' => array('array', null), 
    111111  'files' => array('admin.php'), 
     
    114114array( 
    115115  'name' => 'get_admins_site_links', 
    116   'type' => 'trigger_event', 
     116  'type' => 'trigger_change', 
    117117  'vars' => array('array', 'plugin_links', 'int', 'site_id', 'bool', 'is_remote'), 
    118118  'files' => array('admin\site_manager.php'), 
     
    120120array( 
    121121  'name' => 'get_batch_manager_prefilters', 
    122   'type' => 'trigger_event', 
     122  'type' => 'trigger_change', 
    123123  'vars' => array('array', 'prefilters'), 
    124124  'files' => array('admin\batch_manager_global.php'), 
     
    127127array( 
    128128  'name' => 'get_categories_menu_sql_where', 
    129   'type' => 'trigger_event', 
     129  'type' => 'trigger_change', 
    130130  'vars' => array('string', 'where', 'bool', 'user_expand', 'bool', 'filter_enabled'), 
    131131  'files' => array('include\functions_category.inc.php (get_categories_menu)'), 
     
    133133array( 
    134134  'name' => 'get_category_preferred_image_orders', 
    135   'type' => 'trigger_event', 
     135  'type' => 'trigger_change', 
    136136  'vars' => array('array', null), 
    137137  'files' => array('include\functions_category.inc.php (get_category_preferred_image_orders)'), 
     
    139139array( 
    140140  'name' => 'get_download_url', 
    141   'type' => 'trigger_event', 
     141  'type' => 'trigger_change', 
    142142  'vars' => array('string', 'url', 'array', 'element_info'), 
    143143  'files' => array('include\functions_picture.inc.php (get_download_url)'), 
     
    145145array( 
    146146  'name' => 'get_element_metadata_available', 
    147   'type' => 'trigger_event', 
     147  'type' => 'trigger_change', 
    148148  'vars' => array('bool', null, 'string', 'element_path'), 
    149149  'files' => array('picture.php'), 
     
    151151array( 
    152152  'name' => 'get_element_url', 
    153   'type' => 'trigger_event', 
     153  'type' => 'trigger_change', 
    154154  'vars' => array('string', 'url', 'array', 'element_info'), 
    155155  'files' => array('include\functions_picture.inc.php (get_element_url)'), 
     
    157157array( 
    158158  'name' => 'get_high_location', 
    159   'type' => 'trigger_event', 
     159  'type' => 'trigger_change', 
    160160  'vars' => array('string', 'location', 'array', 'element_info'), 
    161161  'files' => array('include\functions_picture.inc.php (get_high_location)'), 
     
    163163array( 
    164164  'name' => 'get_high_url', 
    165   'type' => 'trigger_event', 
     165  'type' => 'trigger_change', 
    166166  'vars' => array('string', 'url', 'array', 'element_info'), 
    167167  'files' => array('include\functions_picture.inc.php (get_high_url)'), 
     
    169169array( 
    170170  'name' => 'get_history', 
    171   'type' => 'trigger_event', 
     171  'type' => 'trigger_change', 
    172172  'vars' => array('array', null, 'array', 'page_search', 'array', 'types'), 
    173173  'files' => array('admin\history.php'), 
     
    175175array( 
    176176  'name' => 'get_image_location', 
    177   'type' => 'trigger_event', 
     177  'type' => 'trigger_change', 
    178178  'vars' => array('string', 'path', 'array', 'element_info'), 
    179179  'files' => array('include\functions_picture.inc.php (get_image_location)'), 
     
    181181array( 
    182182  'name' => 'get_popup_help_content', 
    183   'type' => 'trigger_event', 
     183  'type' => 'trigger_change', 
    184184  'vars' => array('string', 'help_content', 'string', 'page'), 
    185185  'files' => array('admin\popuphelp.php', 'popuphelp.php'), 
     
    187187array( 
    188188  'name' => 'get_pwg_themes', 
    189   'type' => 'trigger_event', 
     189  'type' => 'trigger_change', 
    190190  'vars' => array('array', 'themes'), 
    191191  'files' => array('include\functions.inc.php (get_pwg_themes)'), 
     
    193193array( 
    194194  'name' => 'get_thumbnail_title', 
    195   'type' => 'trigger_event', 
     195  'type' => 'trigger_change', 
    196196  'vars' => array('string', 'title', 'array', 'info'), 
    197197  'files' => array('include\functions.inc.php (get_thumbnail_title)'), 
     
    199199array( 
    200200  'name' => 'get_comments_derivative_params', 
    201   'type' => 'trigger_event', 
     201  'type' => 'trigger_change', 
    202202  'vars' => array('ImageStdParams', null), 
    203203  'files' => array('comments.php'), 
     
    206206array( 
    207207  'name' => 'get_index_album_derivative_params', 
    208   'type' => 'trigger_event', 
     208  'type' => 'trigger_change', 
    209209  'vars' => array('ImageStdParams', null), 
    210210  'files' => array('includecategory_cats.php', 'include\category_default.inc.php'), 
     
    213213array( 
    214214  'name' => 'get_src_image_url', 
    215   'type' => 'trigger_event', 
     215  'type' => 'trigger_change', 
    216216  'vars' => array('string', 'url', 'SrcImage', 'this'), 
    217217  'files' => array('include\derivative.inc.php (SrcImage::__construct)'), 
     
    220220array( 
    221221  'name' => 'get_derivative_url', 
    222   'type' => 'trigger_event', 
     222  'type' => 'trigger_change', 
    223223  'vars' => array('string', 'url', 'ImageStdParams', null, 'SrcImage', 'this', 'string', 'rel_url'), 
    224224  'files' => array('include\derivative.inc.php (SrcImage::url, SrcImage::get_url)'), 
     
    227227array( 
    228228  'name' => 'get_tag_alt_names', 
    229   'type' => 'trigger_event', 
     229  'type' => 'trigger_change', 
    230230  'vars' => array('array', null, 'array', 'raw_name'), 
    231231  'files' => array('admin\tags.php', 'admin\include\functions.php (get_taglist)'), 
     
    234234array( 
    235235  'name' => 'get_webmaster_mail_address', 
    236   'type' => 'trigger_event', 
     236  'type' => 'trigger_change', 
    237237  'vars' => array('string', 'email'), 
    238238  'files' => array('include\functions.inc.php (get_webmaster_mail_address)'), 
     
    241241array( 
    242242  'name' => 'init', 
    243   'type' => 'trigger_action', 
     243  'type' => 'trigger_notify', 
    244244  'vars' => array(), 
    245245  'files' => array('include\common.inc.php'), 
     
    248248array( 
    249249  'name' => 'invalidate_user_cache', 
    250   'type' => 'trigger_action', 
     250  'type' => 'trigger_notify', 
    251251  'vars' => array('bool', 'full'), 
    252252  'files' => array('admin\include\functions.inc.php (invalidate_user_cache)'), 
     
    254254array( 
    255255  'name' => 'load_conf', 
    256   'type' => 'trigger_action', 
     256  'type' => 'trigger_notify', 
    257257  'vars' => array('string', 'condition'), 
    258258  'files' => array('include\functions.inc.php (load_conf_from_db)'), 
     
    261261array( 
    262262  'name' => 'list_check_integrity', 
    263   'type' => 'trigger_action', 
     263  'type' => 'trigger_notify', 
    264264  'vars' => array('object', 'this'), 
    265265  'files' => array('admin\include\check_integrity.class.php (check_integrity::check)'), 
     
    267267array( 
    268268  'name' => 'load_image_library', 
    269   'type' => 'trigger_action', 
     269  'type' => 'trigger_notify', 
    270270  'vars' => array('object', 'this'), 
    271271  'files' => array('admin\include\image.class.php (pwg_image::__construct)'), 
     
    273273array( 
    274274  'name' => 'load_profile_in_template', 
    275   'type' => 'trigger_action', 
     275  'type' => 'trigger_notify', 
    276276  'vars' => array('array', 'userdata'), 
    277277  'files' => array('profile.php (load_profile_in_template)'), 
     
    279279array( 
    280280  'name' => 'loading_lang', 
    281   'type' => 'trigger_action', 
     281  'type' => 'trigger_notify', 
    282282  'vars' => array(), 
    283283  'files' => array('include\common.inc.php', 'include\functions.inc.php (redirect_html)', 'include\functions_mail.inc.php (switch_lang_to)', 'nbm.php'), 
     
    285285array( 
    286286  'name' => 'loc_after_page_header', 
    287   'type' => 'trigger_action', 
     287  'type' => 'trigger_notify', 
    288288  'vars' => array(), 
    289289  'files' => array('include\page_header.php'), 
     
    291291array( 
    292292  'name' => 'loc_begin_about', 
    293   'type' => 'trigger_action', 
     293  'type' => 'trigger_notify', 
    294294  'vars' => array(), 
    295295  'files' => array('about.php'), 
     
    297297array( 
    298298  'name' => 'loc_begin_admin', 
    299   'type' => 'trigger_action', 
     299  'type' => 'trigger_notify', 
    300300  'vars' => array(), 
    301301  'files' => array('admin.php'), 
     
    303303array( 
    304304  'name' => 'loc_begin_admin_page', 
    305   'type' => 'trigger_action', 
     305  'type' => 'trigger_notify', 
    306306  'vars' => array(), 
    307307  'files' => array('admin.php'), 
     
    309309array( 
    310310  'name' => 'loc_begin_cat_list', 
    311   'type' => 'trigger_action', 
     311  'type' => 'trigger_notify', 
    312312  'vars' => array(), 
    313313  'files' => array('admin\cat_list.php'), 
     
    315315array( 
    316316  'name' => 'loc_begin_cat_modify', 
    317   'type' => 'trigger_action', 
     317  'type' => 'trigger_notify', 
    318318  'vars' => array(), 
    319319  'files' => array('admin\cat_modify.php'), 
     
    321321array( 
    322322  'name' => 'loc_begin_element_set_global', 
    323   'type' => 'trigger_action', 
     323  'type' => 'trigger_notify', 
    324324  'vars' => array(), 
    325325  'files' => array('admin\batch_manager_global.php'), 
     
    327327array( 
    328328  'name' => 'loc_begin_element_set_unit', 
    329   'type' => 'trigger_action', 
     329  'type' => 'trigger_notify', 
    330330  'vars' => array(), 
    331331  'files' => array('admin\batch_manager_unit.php'), 
     
    333333array( 
    334334  'name' => 'loc_begin_index', 
    335   'type' => 'trigger_action', 
     335  'type' => 'trigger_notify', 
    336336  'vars' => array(), 
    337337  'files' => array('index.php'), 
     
    339339array( 
    340340  'name' => 'loc_begin_index_category_thumbnails', 
    341   'type' => 'trigger_action', 
     341  'type' => 'trigger_notify', 
    342342  'vars' => array('array', 'categories'), 
    343343  'files' => array('include\category_cats.inc.php'), 
     
    345345array( 
    346346  'name' => 'loc_begin_index_thumbnails', 
    347   'type' => 'trigger_action', 
     347  'type' => 'trigger_notify', 
    348348  'vars' => array('array', 'pictures'), 
    349349  'files' => array('include\category_default.inc.php'), 
     
    351351array( 
    352352  'name' => 'loc_begin_page_header', 
    353   'type' => 'trigger_action', 
     353  'type' => 'trigger_notify', 
    354354  'vars' => array(), 
    355355  'files' => array('include\page_header.php'), 
     
    357357array( 
    358358  'name' => 'loc_begin_page_tail', 
    359   'type' => 'trigger_action', 
     359  'type' => 'trigger_notify', 
    360360  'vars' => array(), 
    361361  'files' => array('include\page_tail.php'), 
     
    363363array( 
    364364  'name' => 'loc_begin_picture', 
    365   'type' => 'trigger_action', 
     365  'type' => 'trigger_notify', 
    366366  'vars' => array(), 
    367367  'files' => array('picture.php'), 
     
    369369array( 
    370370  'name' => 'loc_begin_profile', 
    371   'type' => 'trigger_action', 
     371  'type' => 'trigger_notify', 
    372372  'vars' => array(), 
    373373  'files' => array('profile.php'), 
     
    375375array( 
    376376  'name' => 'loc_begin_password', 
    377   'type' => 'trigger_action', 
     377  'type' => 'trigger_notify', 
    378378  'vars' => array(), 
    379379  'files' => array('password.php'), 
     
    382382array( 
    383383  'name' => 'loc_begin_register', 
    384   'type' => 'trigger_action', 
     384  'type' => 'trigger_notify', 
    385385  'vars' => array(), 
    386386  'files' => array('register.php'), 
     
    389389array( 
    390390  'name' => 'loc_begin_search', 
    391   'type' => 'trigger_action', 
     391  'type' => 'trigger_notify', 
    392392  'vars' => array(), 
    393393  'files' => array('search.php'), 
     
    396396array( 
    397397  'name' => 'loc_begin_tags', 
    398   'type' => 'trigger_action', 
     398  'type' => 'trigger_notify', 
    399399  'vars' => array(), 
    400400  'files' => array('tags.php'), 
     
    403403array( 
    404404  'name' => 'loc_begin_comments', 
    405   'type' => 'trigger_action', 
     405  'type' => 'trigger_notify', 
    406406  'vars' => array(), 
    407407  'files' => array('comments.php'), 
     
    410410array( 
    411411  'name' => 'loc_begin_identification', 
    412   'type' => 'trigger_action', 
     412  'type' => 'trigger_notify', 
    413413  'vars' => array(), 
    414414  'files' => array('identification.php'), 
     
    417417array( 
    418418  'name' => 'loc_begin_notification', 
    419   'type' => 'trigger_action', 
     419  'type' => 'trigger_notify', 
    420420  'vars' => array(), 
    421421  'files' => array('notification.php'), 
     
    424424array( 
    425425  'name' => 'loc_end_password', 
    426   'type' => 'trigger_action', 
     426  'type' => 'trigger_notify', 
    427427  'vars' => array(), 
    428428  'files' => array('password.php'), 
     
    431431array( 
    432432  'name' => 'loc_end_register', 
    433   'type' => 'trigger_action', 
     433  'type' => 'trigger_notify', 
    434434  'vars' => array(), 
    435435  'files' => array('register.php'), 
     
    438438array( 
    439439  'name' => 'loc_end_search', 
    440   'type' => 'trigger_action', 
     440  'type' => 'trigger_notify', 
    441441  'vars' => array(), 
    442442  'files' => array('search.php'), 
     
    445445array( 
    446446  'name' => 'loc_end_tags', 
    447   'type' => 'trigger_action', 
     447  'type' => 'trigger_notify', 
    448448  'vars' => array(), 
    449449  'files' => array('tags.php'), 
     
    452452array( 
    453453  'name' => 'loc_end_comments', 
    454   'type' => 'trigger_action', 
     454  'type' => 'trigger_notify', 
    455455  'vars' => array(), 
    456456  'files' => array('comments.php'), 
     
    459459array( 
    460460  'name' => 'loc_end_identification', 
    461   'type' => 'trigger_action', 
     461  'type' => 'trigger_notify', 
    462462  'vars' => array(), 
    463463  'files' => array('identification.php'), 
     
    466466array( 
    467467  'name' => 'loc_end_notification', 
    468   'type' => 'trigger_action', 
     468  'type' => 'trigger_notify', 
    469469  'vars' => array(), 
    470470  'files' => array('notification.php'), 
     
    473473array( 
    474474  'name' => 'loc_end_admin', 
    475   'type' => 'trigger_action', 
     475  'type' => 'trigger_notify', 
    476476  'vars' => array(), 
    477477  'files' => array('admin.php'), 
     
    479479array( 
    480480  'name' => 'loc_end_cat_list', 
    481   'type' => 'trigger_action', 
     481  'type' => 'trigger_notify', 
    482482  'vars' => array(), 
    483483  'files' => array('admin\cat_list.php'), 
     
    485485array( 
    486486  'name' => 'loc_end_cat_modify', 
    487   'type' => 'trigger_action', 
     487  'type' => 'trigger_notify', 
    488488  'vars' => array(), 
    489489  'files' => array('admin\cat_modify.php'), 
     
    491491array( 
    492492  'name' => 'loc_end_element_set_global', 
    493   'type' => 'trigger_action', 
     493  'type' => 'trigger_notify', 
    494494  'vars' => array(), 
    495495  'files' => array('admin\batch_manager_global.php'), 
     
    497497array( 
    498498  'name' => 'loc_end_element_set_unit', 
    499   'type' => 'trigger_action', 
     499  'type' => 'trigger_notify', 
    500500  'vars' => array(), 
    501501  'files' => array('admin\batch_manager_unit.php'), 
     
    503503array( 
    504504  'name' => 'loc_end_help', 
    505   'type' => 'trigger_action', 
     505  'type' => 'trigger_notify', 
    506506  'vars' => array(), 
    507507  'files' => array('admin\help.php'), 
     
    509509array( 
    510510  'name' => 'loc_end_index', 
    511   'type' => 'trigger_action', 
     511  'type' => 'trigger_notify', 
    512512  'vars' => array(), 
    513513  'files' => array('index.php'), 
     
    515515array( 
    516516  'name' => 'loc_end_index_category_thumbnails', 
    517   'type' => 'trigger_event', 
     517  'type' => 'trigger_change', 
    518518  'vars' => array('array', 'tpl_thumbnails_var'), 
    519519  'files' => array('include\category_cats.inc.php'), 
     
    521521array( 
    522522  'name' => 'loc_end_index_thumbnails', 
    523   'type' => 'trigger_event', 
     523  'type' => 'trigger_change', 
    524524  'vars' => array('array', 'tpl_thumbnails_var', 'array', 'pictures'), 
    525525  'files' => array('include\category_default.inc.php'), 
     
    527527array( 
    528528  'name' => 'loc_end_no_photo_yet', 
    529   'type' => 'trigger_action', 
     529  'type' => 'trigger_notify', 
    530530  'vars' => array(), 
    531531  'files' => array('include\no_photo_yet.inc.php'), 
     
    533533array( 
    534534  'name' => 'loc_end_page_header', 
    535   'type' => 'trigger_action', 
     535  'type' => 'trigger_notify', 
    536536  'vars' => array(), 
    537537  'files' => array('include\page_header.php'), 
     
    539539array( 
    540540  'name' => 'loc_end_page_tail', 
    541   'type' => 'trigger_action', 
     541  'type' => 'trigger_notify', 
    542542  'vars' => array(), 
    543543  'files' => array('include\page_tail.php'), 
     
    545545array( 
    546546  'name' => 'loc_end_picture', 
    547   'type' => 'trigger_action', 
     547  'type' => 'trigger_notify', 
    548548  'vars' => array(), 
    549549  'files' => array('picture.php'), 
     
    551551array( 
    552552  'name' => 'loc_end_picture_modify', 
    553   'type' => 'trigger_action', 
     553  'type' => 'trigger_notify', 
    554554  'vars' => array(), 
    555555  'files' => array('admin\picture_modify.php'), 
     
    558558array( 
    559559  'name' => 'loc_end_profile', 
    560   'type' => 'trigger_action', 
     560  'type' => 'trigger_notify', 
    561561  'vars' => array(), 
    562562  'files' => array('profile.php'), 
     
    564564array( 
    565565  'name' => 'loc_end_section_init', 
    566   'type' => 'trigger_action', 
     566  'type' => 'trigger_notify', 
    567567  'vars' => array(), 
    568568  'files' => array('include\section_init.inc.php'), 
     
    571571array( 
    572572  'name' => 'loc_end_themes_installed', 
    573   'type' => 'trigger_action', 
     573  'type' => 'trigger_notify', 
    574574  'vars' => array(), 
    575575  'files' => array('admin\themes_installed.php'), 
     
    578578array( 
    579579  'name' => 'loc_visible_user_list', 
    580   'type' => 'trigger_event', 
     580  'type' => 'trigger_change', 
    581581  'vars' => array('array', 'visible_user_list'), 
    582582  'files' => array('admin\user_list.php'), 
     
    584584array( 
    585585  'name' => 'login_failure', 
    586   'type' => 'trigger_action', 
     586  'type' => 'trigger_notify', 
    587587  'vars' => array('string', 'username'), 
    588588  'files' => array('include\functions_user.inc.php (try_log_user)'), 
     
    590590array( 
    591591  'name' => 'login_success', 
    592   'type' => 'trigger_action', 
     592  'type' => 'trigger_notify', 
    593593  'vars' => array('string', 'username'), 
    594594  'files' => array('include\functions_user.inc.php (auto_login, try_log_user)'), 
     
    596596array( 
    597597  'name' => 'nbm_event_handler_added', 
    598   'type' => 'trigger_action', 
     598  'type' => 'trigger_notify', 
    599599  'vars' => array(), 
    600600  'files' => array('admin\notification_by_mail.php'), 
     
    602602array( 
    603603  'name' => 'nbm_render_global_customize_mail_content', 
    604   'type' => 'trigger_event', 
     604  'type' => 'trigger_change', 
    605605  'vars' => array('string', 'customize_mail_content'), 
    606606  'files' => array('admin\notification_by_mail.php (do_action_send_mail_notification)'), 
     
    608608array( 
    609609  'name' => 'nbm_render_user_customize_mail_content', 
    610   'type' => 'trigger_event', 
     610  'type' => 'trigger_change', 
    611611  'vars' => array('string', 'customize_mail_content', 'string', 'nbm_user'), 
    612612  'files' => array('admin\notification_by_mail.php (do_action_send_mail_notification)'), 
     
    614614array( 
    615615  'name' => 'perform_batch_manager_prefilters', 
    616   'type' => 'trigger_event', 
     616  'type' => 'trigger_change', 
    617617  'vars' => array('array', 'filter_sets', 'string', 'session_prefilter'), 
    618618  'files' => array('admin\batch_manager.php'), 
     
    620620array( 
    621621  'name' => 'picture_pictures_data', 
    622   'type' => 'trigger_event', 
     622  'type' => 'trigger_change', 
    623623  'vars' => array('array', 'picture'), 
    624624  'files' => array('picture.php'), 
     
    626626array( 
    627627  'name' => 'plugins_loaded', 
    628   'type' => 'trigger_action', 
     628  'type' => 'trigger_notify', 
    629629  'vars' => array(), 
    630630  'files' => array('include\functions_plugins.inc.php (load_plugins)'), 
     
    632632array( 
    633633  'name' => 'pwg_log_allowed', 
    634   'type' => 'trigger_event', 
     634  'type' => 'trigger_change', 
    635635  'vars' => array('bool', 'do_log', 'int', 'image_id', 'string', 'image_type'), 
    636636  'files' => array('include\functions.inc.php (pwg_log)'), 
     
    638638array( 
    639639  'name' => 'register_user', 
    640   'type' => 'trigger_action', 
     640  'type' => 'trigger_notify', 
    641641  'vars' => array('array', 'user'), 
    642642  'files' => array('include\functions_user.inc.php (register_user)'), 
     
    644644array( 
    645645  'name' => 'register_user_check', 
    646   'type' => 'trigger_event', 
     646  'type' => 'trigger_change', 
    647647  'vars' => array('array', 'errors', 'array', 'user'), 
    648648  'files' => array('include\functions_user.inc.php (register_user)'), 
     
    650650array( 
    651651  'name' => 'render_category_description', 
    652   'type' => 'trigger_event', 
     652  'type' => 'trigger_change', 
    653653  'vars' => array('string', 'category_description', 'string', 'action'), 
    654654  'files' => array('include\category_cats.inc.php', 'include\section_init.inc.php', 'include\ws_functions.inc.php (ws_categories_getList, ws_categories_getAdminList)'), 
     
    656656array( 
    657657  'name' => 'render_category_literal_description', 
    658   'type' => 'trigger_event', 
     658  'type' => 'trigger_change', 
    659659  'vars' => array('string', 'category_description'), 
    660660  'files' => array('include\category_cats.inc.php'), 
     
    662662array( 
    663663  'name' => 'render_category_name', 
    664   'type' => 'trigger_event', 
     664  'type' => 'trigger_change', 
    665665  'vars' => array('string', 'category_name', 'string', 'location'), 
    666666  'files' => array('admin\cat_list.php', 'include\ws_functions.inc.php (ws_categories_getList, ws_categories_getAdminList, ws_categories_move)'), 
     
    668668array( 
    669669  'name' => 'render_comment_author', 
    670   'type' => 'trigger_event', 
     670  'type' => 'trigger_change', 
    671671  'vars' => array('string', 'comment_author'), 
    672672  'files' => array('admin\comments.php', 'comments.php', 'include\picture_comment.inc.php'), 
     
    674674array( 
    675675  'name' => 'render_comment_content', 
    676   'type' => 'trigger_event', 
     676  'type' => 'trigger_change', 
    677677  'vars' => array('string', 'comment_content'), 
    678678  'files' => array('admin\comments.php', 'comments.php', 'include\picture_comment.inc.php'), 
     
    680680array( 
    681681  'name' => 'render_element_content', 
    682   'type' => 'trigger_event', 
     682  'type' => 'trigger_change', 
    683683  'vars' => array('string', 'content', 'array', 'current_picture'), 
    684684  'files' => array('picture.php'), 
     
    686686array( 
    687687  'name' => 'render_element_name', 
    688   'type' => 'trigger_event', 
     688  'type' => 'trigger_change', 
    689689  'vars' => array('string', 'element_name'), 
    690690  'files' => array('include\functions_html.inc.php (render_element_name)'), 
     
    692692array( 
    693693  'name' => 'render_element_description', 
    694   'type' => 'trigger_event', 
     694  'type' => 'trigger_change', 
    695695  'vars' => array('string', 'element_description', 'string', 'action'), 
    696696  'files' => array('picture.php', 'include\functions_html.inc.php (render_element_description)'), 
     
    698698array( 
    699699  'name' => 'render_lost_password_mail_content', 
    700   'type' => 'trigger_event', 
     700  'type' => 'trigger_change', 
    701701  'vars' => array('string', 'message'), 
    702702  'files' => array('password.php (process_password_request)'), 
     
    704704array( 
    705705  'name' => 'render_page_banner', 
    706   'type' => 'trigger_event', 
     706  'type' => 'trigger_change', 
    707707  'vars' => array('string', 'gallery_title'), 
    708708  'files' => array('include\page_header.php'), 
     
    710710array( 
    711711  'name' => 'render_tag_name', 
    712   'type' => 'trigger_event', 
     712  'type' => 'trigger_change', 
    713713  'vars' => array('string', 'tag_name', 'array', 'tag'), 
    714714  'files' => array('admin\include\functions.php (get_taglist)', 'admin\tags.php', 'admin\history.php', 'include\functions_tag.inc.php (get_available_tags, get_all_tags, get_common_tags)', 'include\functions_html.inc.php (get_tags_content_title)', 'include\functions_search.inc.php (get_qsearch_tags)'), 
     
    716716array( 
    717717  'name' => 'render_tag_url', 
    718   'type' => 'trigger_event', 
     718  'type' => 'trigger_change', 
    719719  'vars' => array('string', 'tag_name'), 
    720720  'files' => array('admin\include\functions.php (tag_id_from_tag_name, create_tag)', 'admin\tags.php'), 
     
    722722array( 
    723723  'name' => 'save_profile_from_post', 
    724   'type' => 'trigger_action', 
     724  'type' => 'trigger_notify', 
    725725  'vars' => array('int', 'user_id'), 
    726726  'files' => array('profile.php (save_profile_from_post)'), 
     
    728728array( 
    729729  'name' => 'before_send_mail', 
    730   'type' => 'trigger_event', 
     730  'type' => 'trigger_change', 
    731731  'vars' => array('bool', 'result', 'mixed', 'to', 'array', 'arguments', 'PHPMailer', 'mail'), 
    732732  'files' => array('include\functions_mail.inc.php (pwg_mail)'), 
     
    734734array( 
    735735  'name' => 'before_parse_mail_template', 
    736   'type' => 'trigger_action', 
     736  'type' => 'trigger_notify', 
    737737  'vars' => array('string', 'cache_key', 'string', 'content_type'), 
    738738  'files' => array('include\functions_mail.inc.php (pwg_mail)'), 
     
    740740array( 
    741741  'name' => 'sendResponse', 
    742   'type' => 'trigger_action', 
     742  'type' => 'trigger_notify', 
    743743  'vars' => array('string', 'encodedResponse'), 
    744744  'files' => array('include\ws_core.inc.php (PwgServer::sendResponse)'), 
     
    746746array( 
    747747  'name' => 'set_status_header', 
    748   'type' => 'trigger_action', 
     748  'type' => 'trigger_notify', 
    749749  'vars' => array('int', 'code', 'string', 'text'), 
    750750  'files' => array('include\functions_html.inc.php (set_status_header)'), 
     
    752752array( 
    753753  'name' => 'tabsheet_before_select', 
    754   'type' => 'trigger_event', 
     754  'type' => 'trigger_change', 
    755755  'vars' => array('array', 'sheets', 'string', 'tabsheet_id'), 
    756756  'files' => array('include\tabsheet.class.php (tabsheet::select)'), 
     
    759759array( 
    760760  'name' => 'trigger', 
    761   'type' => 'trigger_action', 
     761  'type' => 'trigger_notify', 
    762762  'vars' => array('array', null), 
    763   'files' => array('include\functions_plugins.inc.php (trigger_event, trigger_action)'), 
     763  'files' => array('include\functions_plugins.inc.php (trigger_change, trigger_notify)'), 
    764764), 
    765765array( 
    766766  'name' => 'user_comment_check', 
    767   'type' => 'trigger_event', 
     767  'type' => 'trigger_change', 
    768768  'vars' => array('string', 'comment_action', 'array', 'comm'), 
    769769  'files' => array('include\functions_comment.inc.php (insert_user_comment, update_user_comment)'), 
     
    772772array( 
    773773  'name' => 'user_comment_deletion', 
    774   'type' => 'trigger_action', 
     774  'type' => 'trigger_notify', 
    775775  'vars' => array('mixed', 'comment_id'), 
    776776  'files' => array('include\functions_comment.inc.php (delete_user_comment)'), 
     
    779779array( 
    780780  'name' => 'user_comment_insertion', 
    781   'type' => 'trigger_action', 
     781  'type' => 'trigger_notify', 
    782782  'vars' => array('array', 'comm'), 
    783783  'files' => array('include\picture_comment.inc.php'), 
     
    785785array( 
    786786  'name' => 'user_comment_validation', 
    787   'type' => 'trigger_action', 
     787  'type' => 'trigger_notify', 
    788788  'vars' => array('mixed', 'comment_id'), 
    789789  'files' => array('include\functions_comment.inc.php (validate_user_comment)'), 
     
    792792array( 
    793793  'name' => 'user_init', 
    794   'type' => 'trigger_action', 
     794  'type' => 'trigger_notify', 
    795795  'vars' => array('array', 'user'), 
    796796  'files' => array('include\user.inc.php'), 
     
    798798array( 
    799799  'name' => 'ws_add_methods', 
    800   'type' => 'trigger_action', 
     800  'type' => 'trigger_notify', 
    801801  'vars' => array('object', 'this'), 
    802802  'files' => array('include\ws_core.inc.php (PwgServer::run)'), 
     
    804804array( 
    805805  'name' => 'ws_invoke_allowed', 
    806   'type' => 'trigger_event', 
     806  'type' => 'trigger_change', 
    807807  'vars' => array('bool', null, 'string', 'methodName', 'array', 'params'), 
    808808  'files' => array('include\ws_core.inc.php (PwgServer::invoke)'), 
     
    810810array( 
    811811  'name' => 'user_logout', 
    812   'type' => 'trigger_action', 
     812  'type' => 'trigger_notify', 
    813813  'vars' => array('int', 'user_id'), 
    814814  'files' => array('include\functions_user.inc.php (logout_user)'), 
     
    817817array( 
    818818  'name' => 'user_login', 
    819   'type' => 'trigger_action', 
     819  'type' => 'trigger_notify', 
    820820  'vars' => array('int', 'user_id'), 
    821821  'files' => array('include\functions_user.inc.php (log_user)'), 
     
    824824array( 
    825825  'name' => 'try_log_user', 
    826   'type' => 'trigger_event', 
     826  'type' => 'trigger_change', 
    827827  'vars' => array('boolean', 'success', 'string', 'username', 'string', 'password', 'bool', 'remember_me'), 
    828828  'files' => array('include\functions_user.inc.php (try_log_user)'), 
     
    831831array( 
    832832  'name' => 'combinable_preparse', 
    833   'type' => 'trigger_action', 
     833  'type' => 'trigger_notify', 
    834834  'vars' => array('Template', 'template', 'Combinable', '$combinable', 'FileCombiner', '$combiner'), 
    835835  'files' => array('include\template.class.php (FileCombiner::process_combinable)'), 
     
    838838array( 
    839839  'name' => 'user_list_columns', 
    840   'type' => 'trigger_event', 
     840  'type' => 'trigger_change', 
    841841  'vars' => array('string[]', 'aColumns'), 
    842842  'files' => array('admin\user_list_backend.php'), 
     
    845845array( 
    846846  'name' => 'after_render_user_list', 
    847   'type' => 'trigger_event', 
     847  'type' => 'trigger_change', 
    848848  'vars' => array('array', 'output'), 
    849849  'files' => array('admin\user_list_backend.php'), 
     
    852852array( 
    853853  'name' => 'update_rating_score', 
    854   'type' => 'trigger_event', 
     854  'type' => 'trigger_change', 
    855855  'vars' => array('boolean', 'done', 'int', 'element_id'), 
    856856  'files' => array('include\functions_rate.inc.php'), 
     
    859859array( 
    860860  'name' => 'picture_modify_before_update', 
    861   'type' => 'trigger_event', 
     861  'type' => 'trigger_change', 
    862862  'vars' => array('array', 'data'), 
    863863  'files' => array('admin\picture_modify.php'), 
     
    866866array( 
    867867  'name' => 'ws_users_getList', 
    868   'type' => 'trigger_event', 
     868  'type' => 'trigger_change', 
    869869  'vars' => array('array', 'users'), 
    870870  'files' => array('include\ws_functions\pwg.users.php'), 
     
    974974        <select class="search_input"> 
    975975          <option value="">Type</option> 
    976           <option value="trigger_action">trigger_action</option> 
    977           <option value="trigger_event">trigger_event</option> 
     976          <option value="trigger_notify">trigger_notify</option> 
     977          <option value="trigger_change">trigger_change</option> 
    978978        </select> 
    979979      </td> 
Note: See TracChangeset for help on using the changeset viewer.