Changeset 16968


Ignore:
Timestamp:
Jul 24, 2012, 11:43:35 AM (12 years ago)
Author:
mistic100
Message:

Merged revision(s) 16967 from trunk:
update triggers_list and fix display bug

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2.4/tools/triggers_list.php

    r15536 r16968  
    2626  'name' => 'allow_increment_element_hit_count',
    2727  'type' => 'trigger_event',
    28   'vars' => array('bool' => 'content_not_set'),
     28  'vars' => array('bool', 'content_not_set'),
    2929  'files' => array('picture.php'),
    3030),
    … …  
    3232  'name' => 'begin_delete_elements',
    3333  'type' => 'trigger_action',
    34   'vars' => array('array' => 'ids'),
     34  'vars' => array('array', 'ids'),
    3535  'files' => array('admin\include\functions.inc.php (delete_elements)'),
    3636),
    … …  
    3838  'name' => 'blockmanager_apply',
    3939  'type' => 'trigger_action',
    40   'vars' => array('object' => 'menublock'),
     40  'vars' => array('object', 'menublock'),
    4141  'files' => array('include\block.class.php (BlockManager::apply)'),
    4242  'infos' => 'use this trigger to modify existing menu blocks',
    … …  
    4545  'name' => 'blockmanager_prepare_display',
    4646  'type' => 'trigger_action',
    47   'vars' => array('object' => 'this'),
     47  'vars' => array('object', 'this'),
    4848  'files' => array('include\block.class.php (BlockManager::prepare_display)'),
    4949),
    … …  
    5151  'name' => 'blockmanager_register_blocks',
    5252  'type' => 'trigger_action',
    53   'vars' => array('object' => 'menu'),
     53  'vars' => array('object', 'menu'),
    5454  'files' => array('include\block.class.php (BlockManager::load_registered_blocks)'),
    5555  'infos' => 'use this trigger to add menu block',
    … …  
    5858  'name' => 'clean_iptc_value',
    5959  'type' => 'trigger_event',
    60   'vars' => array('string' => 'value'),
     60  'vars' => array('string', 'value'),
    6161  'files' => array('include\functions_metadata.inc.php (clean_iptc_value)'),
    6262),
    … …  
    6464  'name' => 'combined_css',
    6565  'type' => 'trigger_event',
    66   'vars' => array('string' => 'href', 'int' => 'file_ver0', 'int' => 'file_ver1'),
     66  'vars' => array('string', 'href', 'int', 'file_ver0', 'int', 'file_ver1'),
    6767  'files' => array('include\template.class.php (Template::flush)'),
    6868),
    … …  
    7070  'name' => 'combined_css_postfilter',
    7171  'type' => 'trigger_event',
    72   'vars' => array('string' => 'css'),
     72  'vars' => array('string', 'css'),
    7373  'files' => array('include\template.class.php (Template::process_css)'),
    7474),
    … …  
    7676  'name' => 'combined_script',
    7777  'type' => 'trigger_event',
    78   'vars' => array('string' => 'ret', 'string' => 'script'),
     78  'vars' => array('string', 'ret', 'string', 'script'),
    7979  'files' => array('include\template.class.php (Template::make_script_src)'),
    8080),
    … …  
    8282  'name' => 'delete_categories',
    8383  'type' => 'trigger_action',
    84   'vars' => array('array' => 'ids'),
     84  'vars' => array('array', 'ids'),
    8585  'files' => array('admin\include\functions.inc.php (delete_categories)'),
    8686),
    … …  
    8888  'name' => 'delete_elements',
    8989  'type' => 'trigger_action',
    90   'vars' => array('array' => 'ids'),
     90  'vars' => array('array', 'ids'),
    9191  'files' => array('admin\include\functions.inc.php (delete_elements)'),
    9292),
    … …  
    9494  'name' => 'delete_user',
    9595  'type' => 'trigger_action',
    96   'vars' => array('int' => 'user_id'),
     96  'vars' => array('int', 'user_id'),
    9797  'files' => array('admin\include\functions.inc.php (delete_user)'),
    9898),
    … …  
    100100  'name' => 'element_set_global_action',
    101101  'type' => 'trigger_action',
    102   'vars' => array('string' => 'action', 'array' => 'collection'),
     102  'vars' => array('string', 'action', 'array', 'collection'),
    103103  'files' => array('admin\batch_manager_global.php'),
    104104),
    … …  
    106106  'name' => 'format_exif_data',
    107107  'type' => 'trigger_event',
    108   'vars' => array('array' => 'exif', 'string' => 'filename', 'array' => 'map'),
     108  'vars' => array('array', 'exif', 'string', 'filename', 'array', 'map'),
    109109  'files' => array('include\functions_metadata.inc.php (get_exif_data)'),
    110110),
    … …  
    124124  'name' => 'get_admin_advanced_features_links',
    125125  'type' => 'trigger_event',
    126   'vars' => array('array' => 'advanced_features'),
     126  'vars' => array('array', 'advanced_features'),
    127127  'files' => array('admin\maintenance.php'),
    128128),
    … …  
    130130  'name' => 'get_admin_plugin_menu_links',
    131131  'type' => 'trigger_event',
    132   'vars' => array('array' => ''),
     132  'vars' => array('array', null),
    133133  'files' => array('admin.php'),
    134134  'infos' => 'use this trigger to add links into admin plugins menu',
    … …  
    137137  'name' => 'get_admins_site_links',
    138138  'type' => 'trigger_event',
    139   'vars' => array('array' => 'plugin_links', 'int' => 'site_id', 'bool' => 'is_remote'),
     139  'vars' => array('array', 'plugin_links', 'int', 'site_id', 'bool', 'is_remote'),
    140140  'files' => array('admin\site_manager.php'),
    141141),
    … …  
    143143  'name' => 'get_batch_manager_prefilters',
    144144  'type' => 'trigger_event',
    145   'vars' => array('array' => 'prefilters'),
     145  'vars' => array('array', 'prefilters'),
    146146  'files' => array('admin\batch_manager_global.php'),
    147147  'infos' => 'use this trigger to add prefilters into batch manager global',
    … …  
    150150  'name' => 'get_categories_menu_sql_where',
    151151  'type' => 'trigger_event',
    152   'vars' => array('string' => 'where', 'bool' => 'user_expand', 'bool' => 'filter_enabled'),
     152  'vars' => array('string', 'where', 'bool', 'user_expand', 'bool', 'filter_enabled'),
    153153  'files' => array('include\functions_category.inc.php (get_categories_menu)'),
    154154),
    … …  
    156156  'name' => 'get_category_preferred_image_orders',
    157157  'type' => 'trigger_event',
    158   'vars' => array('array' => ''),
     158  'vars' => array('array', null),
    159159  'files' => array('include\functions_category.inc.php (get_category_preferred_image_orders)'),
    160160),
    … …  
    162162  'name' => 'get_download_url',
    163163  'type' => 'trigger_event',
    164   'vars' => array('string' => 'url', 'array' => 'element_info'),
     164  'vars' => array('string', 'url', 'array', 'element_info'),
    165165  'files' => array('include\functions_picture.inc.php (get_download_url'),
    166166),
    … …  
    168168  'name' => 'get_element_metadata_available',
    169169  'type' => 'trigger_event',
    170   'vars' => array('bool' => '', 'string' => 'element_path'),
     170  'vars' => array('bool', null, 'string', 'element_path'),
    171171  'files' => array('picture.php'),
    172172),
    … …  
    174174  'name' => 'get_element_url',
    175175  'type' => 'trigger_event',
    176   'vars' => array('string' => 'url', 'array' => 'element_info'),
     176  'vars' => array('string', 'url', 'array', 'element_info'),
    177177  'files' => array('include\functions_picture.inc.php (get_element_url)'),
    178178),
    … …  
    180180  'name' => 'get_high_location',
    181181  'type' => 'trigger_event',
    182   'vars' => array('string' => 'location', 'array' => 'element_info'),
     182  'vars' => array('string', 'location', 'array', 'element_info'),
    183183  'files' => array('include\functions_picture.inc.php (get_high_location)'),
    184184),
    … …  
    186186  'name' => 'get_high_url',
    187187  'type' => 'trigger_event',
    188   'vars' => array('string' => 'url', 'array' => 'element_info'),
     188  'vars' => array('string', 'url', 'array', 'element_info'),
    189189  'files' => array('include\functions_picture.inc.php (get_high_url)'),
    190190),
    … …  
    192192  'name' => 'get_history',
    193193  'type' => 'trigger_event',
    194   'vars' => array('array' => '', 'array' => 'page_search', 'array' => 'types'),
     194  'vars' => array('array', null, 'array', 'page_search', 'array', 'types'),
    195195  'files' => array('admin\history.php'),
    196196),
    … …  
    198198  'name' => 'get_image_location',
    199199  'type' => 'trigger_event',
    200   'vars' => array('string' => 'path', 'array' => 'element_info'),
     200  'vars' => array('string', 'path', 'array', 'element_info'),
    201201  'files' => array('include\functions_picture.inc.php (get_image_location)'),
    202202),
    … …  
    204204  'name' => 'get_popup_help_content',
    205205  'type' => 'trigger_event',
    206   'vars' => array('string' => 'help_content', 'string' => 'page'),
     206  'vars' => array('string', 'help_content', 'string', 'page'),
    207207  'files' => array('admin\popuphelp.php', 'popuphelp.php'),
    208208),
    … …  
    210210  'name' => 'get_pwg_themes',
    211211  'type' => 'trigger_event',
    212   'vars' => array('array' => 'themes'),
     212  'vars' => array('array', 'themes'),
    213213  'files' => array('include\functions.inc.php (get_pwg_themes)'),
    214214),
    … …  
    216216  'name' => 'get_thumbnail_title',
    217217  'type' => 'trigger_event',
    218   'vars' => array('string' => 'title', 'array' => 'info'),
     218  'vars' => array('string', 'title', 'array', 'info'),
    219219  'files' => array('include\functions.inc.php (get_thumbnail_title)'),
    220220),
    … …  
    222222  'name' => 'get_comments_derivative_params',
    223223  'type' => 'trigger_event',
    224   'vars' => array('ImageStdParams' => null),
     224  'vars' => array('ImageStdParams', null),
    225225  'files' => array('comments.php'),
    226226  'infos' => 'New in 2.4',
    … …  
    229229  'name' => 'get_index_album_derivative_params',
    230230  'type' => 'trigger_event',
    231   'vars' => array('ImageStdParams' => null),
     231  'vars' => array('ImageStdParams', null),
    232232  'files' => array('includecategory_cats.php', 'include\category_default.inc.php'),
    233233  'infos' => 'New in 2.4',
    … …  
    236236  'name' => 'get_src_image_url',
    237237  'type' => 'trigger_event',
    238   'vars' => array('string' => 'url', 'SrcImage' => 'this'),
     238  'vars' => array('string', 'url', 'SrcImage', 'this'),
    239239  'files' => array('include\derivative.inc.php (SrcImage::__construct)'),
    240240  'infos' => 'New in 2.4',
    … …  
    243243  'name' => 'get_derivative_url',
    244244  'type' => 'trigger_event',
    245   'vars' => array('string' => 'url', 'ImageStdParams' => null, 'SrcImage' => 'this', 'string' => 'rel_url'),
     245  'vars' => array('string', 'url', 'ImageStdParams', null, 'SrcImage', 'this', 'string', 'rel_url'),
    246246  'files' => array('include\derivative.inc.php (SrcImage::url, SrcImage::get_url)'),
    247247  'infos' => 'New in 2.4',
    … …  
    257257  'name' => 'invalidate_user_cache',
    258258  'type' => 'trigger_action',
    259   'vars' => array('bool' => 'full'),
     259  'vars' => array('bool', 'full'),
    260260  'files' => array('admin\include\functions.inc.php (invalidate_user_cache)'),
    261261),
    … …  
    263263  'name' => 'list_check_integrity',
    264264  'type' => 'trigger_action',
    265   'vars' => array('object' => 'this'),
     265  'vars' => array('object', 'this'),
    266266  'files' => array('admin\include\check_integrity.class.php (check_integrity::check)'),
    267267),
    … …  
    269269  'name' => 'load_image_library',
    270270  'type' => 'trigger_action',
    271   'vars' => array('object' => 'this'),
     271  'vars' => array('object', 'this'),
    272272  'files' => array('admin\include\image.class.php (pwg_image::__construct)'),
    273273),
    … …  
    275275  'name' => 'load_profile_in_template',
    276276  'type' => 'trigger_action',
    277   'vars' => array('array' => 'userdata'),
     277  'vars' => array('array', 'userdata'),
    278278  'files' => array('profile.php (load_profile_in_template)'),
    279279),
    … …  
    341341  'name' => 'loc_begin_index_category_thumbnails',
    342342  'type' => 'trigger_action',
    343   'vars' => array('array' => 'categories'),
     343  'vars' => array('array', 'categories'),
    344344  'files' => array('include\category_cats.inc.php'),
    345345),
    … …  
    347347  'name' => 'loc_begin_index_thumbnails',
    348348  'type' => 'trigger_action',
    349   'vars' => array('array' => 'pictures'),
     349  'vars' => array('array', 'pictures'),
    350350  'files' => array('include\category_default.inc.php'),
    351351),
    … …  
    413413  'name' => 'loc_end_index_category_thumbnails',
    414414  'type' => 'trigger_event',
    415   'vars' => array('array' => 'tpl_thumbnails_var', 'array' => 'categories'),
     415  'vars' => array('array', 'tpl_thumbnails_var', 'array', 'categories'),
    416416  'files' => array('include\category_cats.inc.php'),
    417417),
    … …  
    419419  'name' => 'loc_end_index_thumbnails',
    420420  'type' => 'trigger_event',
    421   'vars' => array('array' => 'tpl_thumbnails_var', 'array' => 'pictures'),
     421  'vars' => array('array', 'tpl_thumbnails_var', 'array', 'pictures'),
    422422  'files' => array('include\category_default.inc.php'),
    423423),
    … …  
    456456  'name' => 'loc_visible_user_list',
    457457  'type' => 'trigger_event',
    458   'vars' => array('array' => 'visible_user_list'),
     458  'vars' => array('array', 'visible_user_list'),
    459459  'files' => array('admin\user_list.php'),
    460460),
    … …  
    462462  'name' => 'login_failure',
    463463  'type' => 'trigger_action',
    464   'vars' => array('string' => 'username'),
     464  'vars' => array('string', 'username'),
    465465  'files' => array('include\functions_user.inc.php (try_log_user)'),
    466466),
    … …  
    468468  'name' => 'login_success',
    469469  'type' => 'trigger_action',
    470   'vars' => array('string' => 'username'),
     470  'vars' => array('string', 'username'),
    471471  'files' => array('include\functions_user.inc.php (auto_login, try_log_user)'),
    472472),
    … …  
    474474  'name' => 'mail_group_assign_vars',
    475475  'type' => 'trigger_event',
    476   'vars' => array('array' => 'assign_vars'),
     476  'vars' => array('array', 'assign_vars'),
    477477  'files' => array('include\functions_mail.inc.php (pwg_mail_group)'),
    478478),
    … …  
    486486  'name' => 'nbm_render_global_customize_mail_content',
    487487  'type' => 'trigger_event',
    488   'vars' => array('string' => 'customize_mail_content'),
     488  'vars' => array('string', 'customize_mail_content'),
    489489  'files' => array('admin\notification_by_mail.php (do_action_send_mail_notification)'),
    490490),
    … …  
    492492  'name' => 'nbm_render_user_customize_mail_content',
    493493  'type' => 'trigger_event',
    494   'vars' => array('string' => 'customize_mail_content', 'string' => 'nbm_user'),
     494  'vars' => array('string', 'customize_mail_content', 'string', 'nbm_user'),
    495495  'files' => array('admin\notification_by_mail.php (do_action_send_mail_notification)'),
    496496),
    … …  
    498498  'name' => 'perform_batch_manager_prefilters',
    499499  'type' => 'trigger_event',
    500   'vars' => array('array' => 'filter_sets', 'string' => 'session_prefilter'),
     500  'vars' => array('array', 'filter_sets', 'string', 'session_prefilter'),
    501501  'files' => array('admin\batch_manager.php'),
    502502),
    … …  
    504504  'name' => 'picture_pictures_data',
    505505  'type' => 'trigger_event',
    506   'vars' => array('array' => 'picture'),
     506  'vars' => array('array', 'picture'),
    507507  'files' => array('picture.php'),
    508508),
    … …  
    516516  'name' => 'pwg_log_allowed',
    517517  'type' => 'trigger_event',
    518   'vars' => array('bool' => 'do_log', 'int' => 'image_id', 'string' => 'image_type'),
     518  'vars' => array('bool', 'do_log', 'int', 'image_id', 'string', 'image_type'),
    519519  'files' => array('include\functions.inc.php (pwg_log)'),
    520520),
    … …  
    522522  'name' => 'register_user',
    523523  'type' => 'trigger_action',
    524   'vars' => array('array' => 'user'),
     524  'vars' => array('array', 'user'),
    525525  'files' => array('include\functions_user.inc.php (register_user)'),
    526526),
    … …  
    528528  'name' => 'register_user_check',
    529529  'type' => 'trigger_event',
    530   'vars' => array('array' => 'errors', 'array' => 'user'),
     530  'vars' => array('array', 'errors', 'array', 'user'),
    531531  'files' => array('include\functions_user.inc.php (register_user)'),
    532532),
    … …  
    534534  'name' => 'render_category_description',
    535535  'type' => 'trigger_event',
    536   'vars' => array('string' => 'category_description', 'string' => 'action'),
     536  'vars' => array('string', 'category_description', 'string', 'action'),
    537537  'files' => array('include\category_cats.inc.php', 'include\section_init.inc.php', 'include\ws_functions.inc.php (ws_categories_getList, ws_categories_getAdminList)'),
    538538),
    … …  
    540540  'name' => 'render_category_literal_description',
    541541  'type' => 'trigger_event',
    542   'vars' => array('string' => 'category_description'),
     542  'vars' => array('string', 'category_description'),
    543543  'files' => array('include\category_cats.inc.php'),
    544544),
    … …  
    546546  'name' => 'render_category_name',
    547547  'type' => 'trigger_event',
    548   'vars' => array('string' => 'category_name', 'string' => 'location'),
     548  'vars' => array('string', 'category_name', 'string', 'location'),
    549549  'files' => array('admin\cat_list.php', 'include\ws_functions.inc.php (ws_categories_getList, ws_categories_getAdminList, ws_categories_move)'),
    550550),
    … …  
    552552  'name' => 'render_comment_author',
    553553  'type' => 'trigger_event',
    554   'vars' => array('string' => 'comment_author'),
     554  'vars' => array('string', 'comment_author'),
    555555  'files' => array('admin\comments.php', 'comments.php', 'include\picture_comment.inc.php'),
    556556),
    … …  
    558558  'name' => 'render_comment_content',
    559559  'type' => 'trigger_event',
    560   'vars' => array('string' => 'comment_content'),
     560  'vars' => array('string', 'comment_content'),
    561561  'files' => array('admin\comments.php', 'comments.php', 'include\picture_comment.inc.php'),
    562562),
    … …  
    564564  'name' => 'render_element_content',
    565565  'type' => 'trigger_event',
    566   'vars' => array('string' => 'content', 'array' => 'current_picture'),
     566  'vars' => array('string', 'content', 'array', 'current_picture'),
    567567  'files' => array('picture.php'),
    568568),
    … …  
    570570  'name' => 'render_element_description',
    571571  'type' => 'trigger_event',
    572   'vars' => array('string' => 'element_name'),
     572  'vars' => array('string', 'element_name'),
    573573  'files' => array('include\functions.inc.php (get_picture_title)', 'picture.php'),
    574574),
    … …  
    576576  'name' => 'render_lost_password_mail_content',
    577577  'type' => 'trigger_event',
    578   'vars' => array('string' => 'message'),
     578  'vars' => array('string', 'message'),
    579579  'files' => array('password.php (process_password_request)'),
    580580),
    … …  
    582582  'name' => 'render_page_banner',
    583583  'type' => 'trigger_event',
    584   'vars' => array('string' => 'gallery_title'),
     584  'vars' => array('string', 'gallery_title'),
    585585  'files' => array('include\page_header.php'),
    586586),
    … …  
    588588  'name' => 'render_tag_name',
    589589  'type' => 'trigger_event',
    590   'vars' => array('string' => 'tag_name'),
     590  'vars' => array('string', 'tag_name'),
    591591  'files' => array('include\functions.php (get_taglist)', 'admin\tags.php', 'include\functions_tag.inc.php (get_available_tags, get_all_tags, get_common_tags)', 'index.php'),
    592592),
    … …  
    594594  'name' => 'render_tag_url',
    595595  'type' => 'trigger_event',
    596   'vars' => array('string' => 'tag_name'),
     596  'vars' => array('string', 'tag_name'),
    597597  'files' => array('include\functions.php (tag_id_from_tag_name, create_tag)', 'admin\tags.php'),
    598598),
    … …  
    600600  'name' => 'save_profile_from_post',
    601601  'type' => 'trigger_action',
    602   'vars' => array('int' => 'user_id'),
     602  'vars' => array('int', 'user_id'),
    603603  'files' => array('profile.php (save_profile_from_post)'),
    604604),
    … …  
    606606  'name' => 'send_mail',
    607607  'type' => 'trigger_event',
    608   'vars' => array('bool' => 'result', 'string' => 'mail_to', 'string' => 'mail_subject', 'string' => 'mail_content', 'array' => 'mail_headers'),
     608  'vars' => array('bool', 'result', 'string', 'mail_to', 'string', 'mail_subject', 'string', 'mail_content', 'array', 'mail_headers'),
    609609  'files' => array('include\functions_mail.inc.php (pwg_mail)'),
    610610),
    … …  
    612612  'name' => 'send_mail_content',
    613613  'type' => 'trigger_event',
    614   'vars' => array('string' => 'content'),
     614  'vars' => array('string', 'content'),
    615615  'files' => array('include\functions_mail.inc.php (pwg_mail)'),
    616616),
    … …  
    618618  'name' => 'send_mail_headers',
    619619  'type' => 'trigger_event',
    620   'vars' => array('array' => 'headers'),
     620  'vars' => array('array', 'headers'),
    621621  'files' => array('include\functions_mail.inc.php (pwg_mail)'),
    622622),
    … …  
    624624  'name' => 'send_mail_subject',
    625625  'type' => 'trigger_event',
    626   'vars' => array('string' => 'cvt_subject'),
     626  'vars' => array('string', 'cvt_subject'),
    627627  'files' => array('include\functions_mail.inc.php (pwg_mail)'),
    628628),
    … …  
    630630  'name' => 'send_mail_to',
    631631  'type' => 'trigger_event',
    632   'vars' => array('string' => 'to'),
     632  'vars' => array('string', 'to'),
    633633  'files' => array('include\functions_mail.inc.php (pwg_mail)'),
    634634),
    … …  
    636636  'name' => 'sendResponse',
    637637  'type' => 'trigger_action',
    638   'vars' => array('string' => 'encodedResponse'),
     638  'vars' => array('string', 'encodedResponse'),
    639639  'files' => array('include\ws_core.inc.php (PwgServer::sendResponse)'),
    640640),
    … …  
    642642  'name' => 'set_status_header',
    643643  'type' => 'trigger_action',
    644   'vars' => array('int' => 'code', 'string' => 'text'),
     644  'vars' => array('int', 'code', 'string', 'text'),
    645645  'files' => array('include\functions_html.inc.php (set_status_header)'),
    646646),
    647647array(
     648  'name' => 'tabsheet_before_select',
     649  'type' => 'trigger_event',
     650  'vars' => array('array', 'sheets', 'string', 'tabsheet_id'),
     651  'files' => array('include\tabsheet.class.php (tabsheet::select)'),
     652  'infos' => 'New in 2.4, use this trigger to add tabs to a tabsheets',
     653),
     654array(
    648655  'name' => 'trigger',
    649656  'type' => 'trigger_action',
    650   'vars' => array('array' => ''),
     657  'vars' => array('array', null),
    651658  'files' => array('include\functions_plugins.inc.php (trigger_event, trigger_action)'),
    652659),
    … …  
    654661  'name' => 'user_comment_check',
    655662  'type' => 'trigger_event',
    656   'vars' => array('string' => 'comment_action', 'array' => 'comm'),
     663  'vars' => array('string', 'comment_action', 'array', 'comm'),
    657664  'files' => array('include\functions_comment.inc.php (insert_user_comment, update_user_comment)'),
    658665  'infos' => 'use this trigger to add conditions on comment validation',
    … …  
    661668  'name' => 'user_comment_deletion',
    662669  'type' => 'trigger_action',
    663   'vars' => array('mixed' => 'comment_id'),
     670  'vars' => array('mixed', 'comment_id'),
    664671  'files' => array('include\functions_comment.inc.php (delete_user_comment)'),
    665672  'infos' => '$comment_id is and int or an array of int',
    … …  
    668675  'name' => 'user_comment_insertion',
    669676  'type' => 'trigger_action',
    670   'vars' => array('array' => 'comm'),
     677  'vars' => array('array', 'comm'),
    671678  'files' => array('include\picture_comment.inc.php'),
    672679),
    … …  
    674681  'name' => 'user_comment_validation',
    675682  'type' => 'trigger_action',
    676   'vars' => array('mixed' => 'comment_id'),
     683  'vars' => array('mixed', 'comment_id'),
    677684  'files' => array('include\functions_comment.inc.php (validate_user_comment)'),
    678685  'infos' => '$comment_id is and int or an array of int',
    … …  
    681688  'name' => 'user_init',
    682689  'type' => 'trigger_action',
    683   'vars' => array('array' => 'user'),
     690  'vars' => array('array', 'user'),
    684691  'files' => array('include\user.inc.php'),
    685692),
    … …  
    687694  'name' => 'ws_add_methods',
    688695  'type' => 'trigger_action',
    689   'vars' => array('object' => 'this'),
     696  'vars' => array('object', 'this'),
    690697  'files' => array('include\ws_core.inc.php (PwgServer::run)'),
    691698),
    … …  
    693700  'name' => 'ws_invoke_allowed',
    694701  'type' => 'trigger_event',
    695   'vars' => array('bool' => '', 'string' => 'methodName', 'array' => 'params'),
     702  'vars' => array('bool', null, 'string', 'methodName', 'array', 'params'),
    696703  'files' => array('include\ws_core.inc.php (PwgServer::invoke)'),
    697704),
    … …  
    744751    <td>'.$trigger['type'].'</td>
    745752    <td>';
    746     $f=1;
    747     foreach ($trigger['vars'] as $type => $name)
     753    for ($i=0; $i<count($trigger['vars']); $i+=2)
    748754    {
    749       if (!$f) echo ', '; $f=0;
    750       echo $type.' '.(!empty($name)?'<i>$'.$name.'</i>':'');
     755      if ($i>0) echo ', ';
     756      echo $trigger['vars'][$i].' '.(!empty($trigger['vars'][$i+1])?'<i>$'.$trigger['vars'][$i+1].'</i>':null);
    751757    }
    752758    echo '
Note: See TracChangeset for help on using the changeset viewer.