Dotclear

Changeset 2095:1fceb8fc56a6


Ignore:
Timestamp:
09/25/13 22:04:57 (12 years ago)
Author:
Denis Jean-Chirstian <contact@…>
Branch:
default
Message:

Now load _prepend.php files from dcModules::loadModuleFile(), cleanup officials plugins prepend files, addresses #1471, addresses #1716

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • inc/core/class.dc.modules.php

    r1196 r2095  
    118118               if (file_exists($m['root'].'/_prepend.php')) 
    119119               { 
    120                     $r = require $m['root'].'/_prepend.php'; 
     120                    $r = $this->loadModuleFile($m['root'].'/_prepend.php'); 
    121121                     
    122122                    # If _prepend.php file returns null (ie. it has a void return statement) 

  • plugins/akismet/_prepend.php

    r1179 r2095  
    1212if (!defined('DC_RC_PATH')) { return; } 
    1313 
    14 global $__autoload, $core; 
    1514$__autoload['dcFilterAkismet'] = dirname(__FILE__).'/class.dc.filter.akismet.php'; 
    1615$core->spamfilters[] = 'dcFilterAkismet'; 
    17 ?> 

  • plugins/antispam/_prepend.php

    r1179 r2095  
    1111# -- END LICENSE BLOCK ----------------------------------------- 
    1212if (!defined('DC_RC_PATH')) { return; } 
    13  
    14 global $__autoload, $core; 
    1513 
    1614$__autoload['dcSpamFilter'] = dirname(__FILE__).'/inc/class.dc.spamfilter.php'; 
    … …  
    2826$core->url->register('spamfeed','spamfeed','^spamfeed/(.+)$',array('dcAntispamURL','spamFeed')); 
    2927$core->url->register('hamfeed','hamfeed','^hamfeed/(.+)$',array('dcAntispamURL','hamFeed')); 
    30 ?> 

  • plugins/blogroll/_prepend.php

    r1179 r2095  
    1212if (!defined('DC_RC_PATH')) { return; } 
    1313 
    14 $GLOBALS['__autoload']['dcBlogroll'] = dirname(__FILE__).'/class.dc.blogroll.php'; 
    15 ?> 
     14$__autoload['dcBlogroll'] = dirname(__FILE__).'/class.dc.blogroll.php'; 

  • plugins/buildtools/_prepend.php

    r1977 r2095  
    11<?php 
    22 
    3 global $__autoload; 
    4  
    53$__autoload['dcMaintenanceBuildtools'] = dirname(__FILE__).'/class.dc.maintenance.buildtools.php'; 

  • plugins/daInstaller/_prepend.php

    r1046 r2095  
    1212$__autoload['daModulesList']       = dirname(__FILE__).'/inc/lib.da.installer.ui.php'; 
    1313$__autoload['daModulesUpdateList'] = dirname(__FILE__).'/inc/lib.da.installer.ui.php'; 
    14  
    15 ?> 

  • plugins/fairTrackbacks/_prepend.php

    r1179 r2095  
    1212if (!defined('DC_RC_PATH')) { return; } 
    1313 
    14 global $__autoload; 
    15  
    1614if (!defined('DC_FAIRTRACKBACKS_FORCE')) { 
    1715     define('DC_FAIRTRACKBACKS_FORCE',false); 
    … …  
    2220     $core->spamfilters[] = 'dcFilterFairTrackbacks'; 
    2321} 
    24 ?> 

  • plugins/importExport/_prepend.php

    r2044 r2095  
    1111# -- END LICENSE BLOCK ----------------------------------------- 
    1212if (!defined('DC_RC_PATH')) { return; } 
    13  
    14 global $__autoload; 
    1513 
    1614$__autoload['dcIeModule'] =   dirname(__FILE__).'/inc/class.dc.ieModule.php'; 
    … …  
    2826$__autoload['flatExport'] =   dirname(__FILE__).'/inc/flat/class.flat.export.php'; 
    2927 
    30 $this->core->addBehavior('importExportModules','registerIeModules'); 
     28$core->addBehavior('importExportModules','registerIeModules'); 
    3129 
    32 function registerIeModules($modules) 
     30function registerIeModules($modules, $core) 
    3331{ 
    34      $modules['import'] = array_merge($modules['import'],array('dcImportFlat')); 
    35      $modules['import'] = array_merge($modules['import'],array('dcImportFeed')); 
     32     $modules['import'] = array_merge($modules['import'], array('dcImportFlat')); 
     33     $modules['import'] = array_merge($modules['import'], array('dcImportFeed')); 
    3634      
    37      $modules['export'] = array_merge($modules['export'],array('dcExportFlat')); 
     35     $modules['export'] = array_merge($modules['export'], array('dcExportFlat')); 
    3836      
    39      if ($GLOBALS['core']->auth->isSuperAdmin()) { 
    40           $modules['import'] = array_merge($modules['import'],array('dcImportDC1')); 
    41           $modules['import'] = array_merge($modules['import'],array('dcImportWP')); 
     37     if ($core->auth->isSuperAdmin()) { 
     38          $modules['import'] = array_merge($modules['import'], array('dcImportDC1')); 
     39          $modules['import'] = array_merge($modules['import'], array('dcImportWP')); 
    4240     } 
    4341} 

  • plugins/importExport/index.php

    r2045 r2095  
    3131 
    3232# --BEHAVIOR-- importExportModules 
    33 $core->callBehavior('importExportModules',$modules); 
     33$core->callBehavior('importExportModules', $modules, $core); 
    3434 
    3535$type = null; 

  • plugins/maintenance/_prepend.php

    r2044 r2095  
    1111# -- END LICENSE BLOCK ----------------------------------------- 
    1212if (!defined('DC_RC_PATH')) { return; } 
    13  
    14 global $__autoload; 
    1513 
    1614$__autoload['dcMaintenance'] = dirname(__FILE__).'/inc/class.dc.maintenance.php'; 

  • plugins/pages/_prepend.php

    r2055 r2095  
    1212if (!defined('DC_RC_PATH')) { return; } 
    1313 
    14 global $core, $__autoload; 
    15  
    1614$__autoload['dcPagesActionsPage'] = dirname(__FILE__).'/class.actionpage.php'; 
    1715$__autoload['adminPageList'] = dirname(__FILE__).'/class.listpage.php'; 
    1816 
    19 $core->url->register('pages','pages','^pages/(.+)$',array('urlPages','pages')); 
    20 $core->url->register('pagespreview','pagespreview','^pagespreview/(.+)$',array('urlPages','pagespreview')); 
     17$core->url->register('pages', 'pages', '^pages/(.+)$', array('urlPages', 'pages')); 
     18$core->url->register('pagespreview', 'pagespreview', '^pagespreview/(.+)$', array('urlPages', 'pagespreview')); 
    2119 
    22 $core->setPostType('page','plugin.php?p=pages&act=page&id=%d',$core->url->getURLFor('pages','%s'),'Pages'); 
     20$core->setPostType('page', 'plugin.php?p=pages&act=page&id=%d', $core->url->getURLFor('pages', '%s'), 'Pages'); 
    2321 
    2422# We should put this as settings later 
    2523$GLOBALS['page_url_format'] = '{t}'; 
    26 ?> 

  • plugins/tags/_prepend.php

    r1179 r2095  
    1212if (!defined('DC_RC_PATH')) { return; } 
    1313 
    14 $GLOBALS['core']->url->register('tag','tag','^tag/(.+)$',array('urlTags','tag')); 
    15 $GLOBALS['core']->url->register('tags','tags','^tags$',array('urlTags','tags')); 
    16 $GLOBALS['core']->url->register('tag_feed','feed/tag','^feed/tag/(.+)$',array('urlTags','tagFeed')); 
    17 ?> 
     14$core->url->register('tag', 'tag', '^tag/(.+)$', array('urlTags', 'tag')); 
     15$core->url->register('tags', 'tags', '^tags$', array('urlTags', 'tags')); 
     16$core->url->register('tag_feed', 'feed/tag', '^feed/tag/(.+)$', array('urlTags', 'tagFeed')); 
Note: See TracChangeset for help on using the changeset viewer.

Sites map