Changeset 2313:ef1db3d7c388 for inc/core/class.dc.core.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/core/class.dc.core.php (modified) (7 diffs)
• inc/core/class.dc.core.php (modified) (4 diffs)

inc/core/class.dc.core.php

@@ -65 +65 @@
           if ($this->con instanceof mysqlConnection) {
                mysqlConnection::$weak_locks = true;
+          } elseif ($this->con instanceof mysqliConnection) {
+               mysqliConnection::$weak_locks = true;
           }
           
@@ -382 +384 @@
      }
      
-     public function setPostType($type,$admin_url,$public_url)
+     public function setPostType($type,$admin_url,$public_url,$label='')
      {
           $this->post_types[$type] = array(
                'admin_url' => $admin_url,
-               'public_url' => $public_url
+               'public_url' => $public_url,
+               'label' => ($label != '' ? $label : $type)
           );
      }
@@ -854 +857 @@
           $strReq =
           'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '.
-          'user_displayname, permissions '.
+          'user_displayname, user_email, permissions '.
           'FROM '.$this->prefix.'user U '.
           'JOIN '.$this->prefix.'permissions P ON U.user_id = P.user_id '.
@@ -863 +866 @@
                'UNION '.
                'SELECT U.user_id AS user_id, user_super, user_name, user_firstname, '.
-               "user_displayname, NULL AS permissions ".
+               "user_displayname, user_email, NULL AS permissions ".
                'FROM '.$this->prefix.'user U '.
                'WHERE user_super = 1 ';
@@ -878 +881 @@
                     'firstname' => $rs->user_firstname,
                     'displayname' => $rs->user_displayname,
+                    'email' => $rs->user_email,
                     'super' => (boolean) $rs->user_super,
                     'p' => $this->auth->parsePermissions($rs->permissions)
@@ -965 +969 @@
           
           if (!empty($params['q'])) {
-               $params['q'] = str_replace('*','%',$params['q']);
+               $params['q'] = strtolower(str_replace('*','%',$params['q']));
                $where .=
                'AND ('.
@@ -1375 +1379 @@
                     array('use_smilies','boolean',false,
                     'Show smilies on entries and comments'),
+                    array('inc_subcats','boolean',false,
+                    'Include sub-categories in category page and category posts feed'),
                     array('wiki_comments','boolean',false,
                     'Allow commenters to use a subset of wiki syntax')

inc/core/class.dc.core.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -39 +39 @@
      public $rest;       ///< <b>dcRestServer</b> dcRestServer object
      public $log;        ///< <b>dcLog</b>             dcLog object
+     public $tpl;        ///< <b>Twig_Environment</b>  Twig_Environment object
      
      private $versions = null;
@@ -97 +98 @@
           $this->addFormater('xhtml', create_function('$s','return $s;'));
           $this->addFormater('wiki', array($this,'wikiTransform'));
+          $this->loadTemplateEnvironment();
      }
      
@@ -120 +122 @@
      }
      
+     /**
+     Create template environment (Twig_Environment instance)
+     
+     default-templates path must be added from admin|public/prepend.php with:
+     $core->tpl->getLoader()->addPath('PATH_TO/default-templates');
+     Selected theme path must be added with:
+     $core->tpl->getLoader()->prependPath('PATH_TO/MY_THEME');
+     */
+     public function loadTemplateEnvironment()
+     {
+          $cache_dir = path::real(DC_TPL_CACHE.'/twtpl',false);
+          if (!is_dir($cache_dir)) {
+               try {
+                    files::makeDir($cache_dir);
+               } catch (Exception $e) {
+                    $cache_dir = false;
+               }
+          }
+          
+          $this->tpl = new Twig_Environment(
+               new Twig_Loader_Filesystem(dirname(__FILE__).'/../swf'),
+               array(
+                    'auto_reload' => true,
+                    'autoescape' => false,
+                    'base_template_class' => 'Twig_Template',
+                    'cache' => $cache_dir, 
+                    'charset' => 'UTF-8',
+                    'debug' => DC_DEBUG,
+                    'optimizations' => -1,
+                    'strict_variables' => 0 //DC_DEBUG // Please fix undefined variables!
+               )
+          );
+          $this->tpl->addExtension(new dcFormExtension($this));
+          $this->tpl->addExtension(new dcTabExtension($this));
+     }
      
      /// @name Blog init methods