Changeset 1655


Ignore:
Timestamp:
Dec 14, 2006, 1:58:57 AM (17 years ago)
Author:
rvelices
Message:
  • plugins admin menu appear now in the admin page menubar
  • plugins are loaded immediately after loading the config (allow

them to hack more of pwg like user init, template init etc...)

  • trigger event format_exif_data (for picture display only)
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin.php

    r1578 r1655  
    3232
    3333include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     34include_once(PHPWG_ROOT_PATH.'admin/include/functions_plugins.inc.php');
    3435
    3536// +-----------------------------------------------------------------------+
    … …  
    5859  $page['page'] = 'intro';
    5960}
     61
     62$page['errors'] = array();
     63$page['infos']  = array();
    6064
    6165$link_start = PHPWG_ROOT_PATH.'admin.php?page=';
    … …  
    115119}
    116120
    117 //------------------------------------------------------------- content display
    118 $page['errors'] = array();
    119 $page['infos']  = array();
     121// required before plugin page inclusion
     122trigger_action('plugin_admin_menu');
    120123
    121124include(PHPWG_ROOT_PATH.'admin/'.$page['page'].'.php');
     125
     126//------------------------------------------------------------- content display
     127$template->assign_block_vars('plugin_menu.menu_item',
     128    array(
     129      'NAME' => l10n('admin'),
     130      'URL' => $link_start.'plugins'
     131    )
     132  );
     133if ( isset($page['plugin_admin_menu']) )
     134{
     135  $plug_base_url = $link_start.'plugin&section=';
     136  foreach ($page['plugin_admin_menu'] as $menu)
     137  {
     138    $template->assign_block_vars('plugin_menu.menu_item',
     139        array(
     140          'NAME' => $menu['title'],
     141          'URL' => $plug_base_url.$menu['uid']
     142        )
     143      );
     144  }
     145}
    122146
    123147// +-----------------------------------------------------------------------+
    … …  
    127151if (count($page['errors']) != 0)
    128152{
    129   $template->assign_block_vars('errors',array());
    130153  foreach ($page['errors'] as $error)
    131154  {
    … …  
    136159if (count($page['infos']) != 0)
    137160{
    138   $template->assign_block_vars('infos',array());
    139161  foreach ($page['infos'] as $info)
    140162  {

  • trunk/admin/plugin.php

    r1590 r1655  
    3232
    3333include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
    34 include_once(PHPWG_ROOT_PATH.'admin/include/functions_plugins.inc.php');
    3534check_status(ACCESS_ADMINISTRATOR);
    3635
    3736$template->set_filenames(array('plugin' => 'admin/plugin.tpl'));
    3837
    39 trigger_action('plugin_admin_menu');
    40 
    41 
    4238if ( isset($page['plugin_admin_menu']) )
    4339{
    44   $template->assign_block_vars('plugin_menu.menu_item',
    45       array(
    46         'NAME' => l10n('Plugins'),
    47         'URL' => PHPWG_ROOT_PATH.'admin.php?page=plugins'
    48       )
    49     );
    50 
    51   $plug_base_url = PHPWG_ROOT_PATH.'admin.php?page=plugin&section=';
    5240  foreach ($page['plugin_admin_menu'] as $menu)
    5341  {
    … …  
    5543    {
    5644      $found_menu=$menu;
     45      break;
    5746    }
    58     $template->assign_block_vars('plugin_menu.menu_item',
    59         array(
    60           'NAME' => $menu['title'],
    61           'URL' => $plug_base_url.$menu['uid']
    62         )
    63       );
    6447  }
    6548}
     49
    6650if ( isset($found_menu) )
    6751{
     52  $template->assign_var('PLUGIN_TITLE', $found_menu['title'] );
    6853  call_user_func(
    6954    $found_menu['function'],

  • trunk/admin/plugins.php

    r1590 r1655  
    3232
    3333include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
    34 include_once(PHPWG_ROOT_PATH.'admin/include/functions_plugins.inc.php');
    3534check_status(ACCESS_ADMINISTRATOR);
    3635
    … …  
    162161
    163162$template->set_filenames(array('plugins' => 'admin/plugins.tpl'));
    164 
    165 trigger_action('plugin_admin_menu');
    166 
    167 $template->assign_block_vars('plugin_menu.menu_item',
    168     array(
    169       'NAME' => l10n('Plugins'),
    170       'URL' => PHPWG_ROOT_PATH.'admin.php?page=plugins'
    171     )
    172   );
    173 
    174 if ( isset($page['plugin_admin_menu']) )
    175 {
    176   $plug_base_url = PHPWG_ROOT_PATH.'admin.php?page=plugin&section=';
    177   foreach ($page['plugin_admin_menu'] as $menu)
    178   {
    179     $template->assign_block_vars('plugin_menu.menu_item',
    180         array(
    181           'NAME' => $menu['title'],
    182           'URL' => $plug_base_url.$menu['uid']
    183         )
    184       );
    185   }
    186 }
    187163
    188164$num=0;

  • trunk/include/common.inc.php

    r1598 r1655  
    138138//
    139139load_conf_from_db();
     140load_plugins();
    140141
    141142include(PHPWG_ROOT_PATH.'include/user.inc.php');
    … …  
    158159// template instance
    159160$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template'], $user['theme'] );
    160 
    161 load_plugins();
    162161
    163162if ($conf['gallery_locked'])

  • trunk/include/picture_metadata.inc.php

    r1590 r1655  
    4242  if ($exif = @read_exif_data($picture['current']['image_path']))
    4343  {
     44    $exif = trigger_event('format_exif_data', $exif, $picture['current'] );
    4445    $template->assign_block_vars(
    4546      'metadata.headline',

  • trunk/index.php

    r1651 r1655  
    353353pwg_log('category', $page['title']);
    354354
     355include(PHPWG_ROOT_PATH.'include/page_header.php');
    355356trigger_action('loc_end_index');
    356 include(PHPWG_ROOT_PATH.'include/page_header.php');
    357357$template->parse('index');
    358358include(PHPWG_ROOT_PATH.'include/page_tail.php');

  • trunk/plugins/event_tracer/tracer_admin.php

    r1580 r1655  
    1010  $v = str_replace( "\r\n", "\n", $v );
    1111  $v = str_replace( "\n\n", "\n", $v );
    12   $this->my_config['filters'] = explode("\n", $v);
     12  $v = stripslashes($v);
     13  if (!empty($v))
     14    $this->my_config['filters'] = explode("\n", $v);
     15  else
     16    $this->my_config['filters'] = array();
    1317  $this->my_config['show_args'] = isset($_POST['eventTracer_show_args']);
    1418  $this->save_config();

  • trunk/template/yoga/admin.tpl

    r1578 r1655  
    7272    </dd>
    7373  </dl>
     74  <dl>
     75    <dt>{lang:Plugins}</dt>
     76    <dd>
     77      <ul>
     78<!-- BEGIN plugin_menu -->
     79<!-- BEGIN menu_item -->
     80        <li><a href="{plugin_menu.menu_item.URL}">{plugin_menu.menu_item.NAME}</a></li>
     81<!-- END menu_item -->
     82<!-- END plugin_menu -->
     83      </ul>
     84    </dd>
     85  </dl>
    7486</div> <!-- menubar -->
    7587

  • trunk/template/yoga/admin/plugin.tpl

    r1580 r1655  
    11<div class="titrePage">
    2   <h2>
    3 <!-- BEGIN plugin_menu -->
    4 <!-- BEGIN menu_item -->
    5   <span style="margin-left:2px;"><a href="{plugin_menu.menu_item.URL}">{plugin_menu.menu_item.NAME}</a></span>
    6 <!-- END menu_item -->
    7 <!-- END plugin_menu -->
    8   </h2>
     2  <h2>{PLUGIN_TITLE}</h2>
    93</div>
    104

  • trunk/template/yoga/admin/plugins.tpl

    r1584 r1655  
    11<div class="titrePage">
    2   <h2>
    3 <!-- BEGIN plugin_menu -->
    4 <!-- BEGIN menu_item -->
    5   <span style="margin-left:2px;"><a href="{plugin_menu.menu_item.URL}">{plugin_menu.menu_item.NAME}</a></span>
    6 <!-- END menu_item -->
    7 <!-- END plugin_menu -->
     2  <h2>{lang:Plugins}
    83  </h2>
    94</div>
    … …  
    2520  <td>
    2621  <!-- BEGIN action -->
    27   <a href="{plugins.plugin.action.U_ACTION}">{plugins.plugin.action.L_ACTION}</a>
     22  <a href="{plugins.plugin.action.U_ACTION}" {TAG_INPUT_ENABLED}>{plugins.plugin.action.L_ACTION}</a>
    2823  <!-- END action -->
    2924  </td>
Note: See TracChangeset for help on using the changeset viewer.