Changeset 2313:ef1db3d7c388 for inc/prepend.php

Timestamp:

10/08/13 15:27:39 (12 years ago)

Author:

Dsls

Branch:

twig

Parents:

1524:913f5a36bbb0 (diff), 2312:d01c85eaa37d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Twig merge - lots of things to adapt yet

Files:

• inc/prepend.php (modified) (6 diffs)
• inc/prepend.php (modified) (5 diffs)

inc/prepend.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -47 +47 @@
 $__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
 $__autoload['dcTwigPage']               = dirname(__FILE__).'/core/class.dc.twig.page.php';
+$__autoload['dcStore']             = dirname(__FILE__).'/core/class.dc.store.php';
+$__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php';
+$__autoload['dcStoreParser']       = dirname(__FILE__).'/core/class.dc.store.parser.php';
+$__autoload['dcFavorites']              = dirname(__FILE__).'/admin/class.dc.favorites.php';
 
 $__autoload['rsExtPost']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
@@ -61 +65 @@
 $__autoload['adminCommentList']         = dirname(__FILE__).'/admin/lib.pager.php';
 $__autoload['adminUserList']            = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['dcPager']        = dirname(__FILE__).'/admin/lib.pager.php';
+$__autoload['dcAdminCombos']            = dirname(__FILE__).'/admin/lib.admincombos.php';
+$__autoload['adminModulesList']              = dirname(__FILE__).'/admin/lib.moduleslist.php';
+$__autoload['adminThemesList']               = dirname(__FILE__).'/admin/lib.moduleslist.php';
 
 $__autoload['dcTemplate']               = dirname(__FILE__).'/public/class.dc.template.php';
 $__autoload['context']                  = dirname(__FILE__).'/public/lib.tpl.context.php';
 $__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php';
+$__autoload['dcPostsActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcactionposts.php';
+$__autoload['dcCommentsActionsPage']              = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';
+$__autoload['dcActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcaction.php';
 $__autoload['dcForm']              = dirname(__FILE__).'/admin/class.dc.form.php';
 $__autoload['dcFormExtension']               = dirname(__FILE__).'/admin/class.dc.form.php';
@@ -153 +164 @@
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');
 define('DC_L10N_UPDATE_URL','http://services.dotclear.net/dc2.l10n/?version=%s');
+define('DC_DISTRIB_PLUGINS','aboutConfig,akismet,antispam,attachments,blogroll,blowupConfig,dclegacy,fairTrackbacks,importExport,maintenance,pages,pings,simpleMenu,tags,themeEditor,userPref,widgets');
+define('DC_DISTRIB_THEMES','blueSilence,blowupConfig,customCSS,default,ductile');
 
 if (!defined('DC_VENDOR_NAME')) {
@@ -246 +259 @@
 $core->url->register('xmlrpc','xmlrpc','^xmlrpc/(.+)$',array('dcUrlHandlers','xmlrpc'));
 
-$core->setPostType('post','post.php?id=%d',$core->url->getURLFor('post','%s'));
+$core->setPostType('post','post.php?id=%d',$core->url->getURLFor('post','%s'),'Posts');
 
 # Store upload_max_filesize in bytes
@@ -313 +326 @@
      {
           if ($l == 'en' || l10n::set(dirname(__FILE__).'/../locales/'.$l.'/main') !== false) {
+               l10n::lang($l);
                break;
           }

inc/prepend.php

@@ -12 +12 @@
 
 /* ------------------------------------------------------------------------------------------- */
-#  ClearBricks, DotClear classes auto-loader
+#  ClearBricks, Twig, DotClear classes auto-loader
 if (@is_dir('/usr/lib/clearbricks')) {
      define('CLEARBRICKS_PATH','/usr/lib/clearbricks');
@@ -46 +46 @@
 $__autoload['dcWorkspace']              = dirname(__FILE__).'/core/class.dc.workspace.php';
 $__autoload['dcPrefs']                  = dirname(__FILE__).'/core/class.dc.prefs.php';
+$__autoload['dcTwigPage']               = dirname(__FILE__).'/core/class.dc.twig.page.php';
 $__autoload['dcStore']             = dirname(__FILE__).'/core/class.dc.store.php';
 $__autoload['dcStoreReader']       = dirname(__FILE__).'/core/class.dc.store.reader.php';
@@ -56 +57 @@
 $__autoload['rsExtUser']                = dirname(__FILE__).'/core/class.dc.rs.extensions.php';
 
+$__autoload['dcAdminContext']                = dirname(__FILE__).'/admin/class.dc.admincontext.php';
 $__autoload['dcMenu']                   = dirname(__FILE__).'/admin/class.dc.menu.php';
 $__autoload['dcPage']                   = dirname(__FILE__).'/admin/lib.dc.page.php';
@@ -74 +76 @@
 $__autoload['dcCommentsActionsPage']              = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';
 $__autoload['dcActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcaction.php';
+$__autoload['dcForm']              = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcFormExtension']               = dirname(__FILE__).'/admin/class.dc.form.php';
+$__autoload['dcTabExtension']           = dirname(__FILE__).'/admin/class.dc.tab.php';
+$__autoload['dcItemList']               = dirname(__FILE__).'/admin/class.dc.list.php';
+$__autoload['dcListFetcher']            = dirname(__FILE__).'/admin/class.dc.list.php';
+
+foreach (array('dcFilterSet', 'dcFilter','dcFilterCombo','dcFilterText','dcFilterBoolean') as $c) {
+     $__autoload[$c] = dirname(__FILE__).'/admin/class.dc.filter.php';
+}
 
 # Clearbricks extensions
 html::$absolute_regs[] = '/(<param\s+name="movie"\s+value=")(.*?)(")/msu';
 html::$absolute_regs[] = '/(<param\s+name="FlashVars"\s+value=".*?(?:mp3|flv)=)(.*?)(&|")/msu';
+
+if (@is_dir('/usr/lib/twig')) {
+     define('TWIG_PATH','/usr/lib/Twig');
+} elseif (is_dir(dirname(__FILE__).'/libs/Twig')) {
+     define('TWIG_PATH',dirname(__FILE__).'/libs/Twig');
+} elseif (isset($_SERVER['TWIG_PATH']) && is_dir($_SERVER['TWIG_PATH'])) {
+     define('TWIG_PATH',$_SERVER['TWIG_PATH']);
+}
+
+if (!defined('TWIG_PATH') || !is_dir(TWIG_PATH)) {
+     exit('No Twig path defined');
+}
+require TWIG_PATH.'/Autoloader.php';
+Twig_Autoloader::register();
+
 /* ------------------------------------------------------------------------------------------- */
 
@@ -134 +160 @@
 # Constants
 define('DC_ROOT',path::real(dirname(__FILE__).'/..'));
-define('DC_VERSION','2.6-dev');
+define('DC_VERSION','2.99-dev');
 define('DC_DIGESTS',dirname(__FILE__).'/digests');
 define('DC_L10N_ROOT',dirname(__FILE__).'/../locales');