Changeset 2715:a87ddf7dbfb5 for inc/core/class.dc.core.php

Timestamp:

05/20/14 08:39:33 (11 years ago)

Author:

Dsls

Branch:

twig

Parents:

2683:fb8aa74332f1 (diff), 2714:eed2e5727277 (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:

Merge with default (admin/post.php still to update with editor preferences, in twig template)

Files:

• inc/core/class.dc.core.php (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (89 diffs)

inc/core/class.dc.core.php

@@ -901 +901 @@
                'edit_size' => 24,
                'enable_wysiwyg' => true,
+            'editor' => 'dcLegacyEditor',
                'post_format' => 'wiki'
           );

inc/core/class.dc.core.php

@@ -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
      public $stime;      ///< <b>float</b>             starting time
-
+     
      private $versions = null;
      private $formaters = array();
      private $behaviors = array();
      private $post_types = array();
-
+     
      /**
      dcCore constructor inits everything related to Dotclear. It takes arguments
      to init database connection.
-
+     
      @param    driver    <b>string</b>  Database driver name
      @param    host      <b>string</b>  Database hostname
@@ -67 +68 @@
 
           $this->con = dbLayer::init($driver,$host,$db,$user,$password,$persist);
-
+          
           # define weak_locks for mysql
           if ($this->con instanceof mysqlConnection) {
@@ -74 +75 @@
                mysqliConnection::$weak_locks = true;
           }
-
+          
           # define searchpath for postgresql
           if ($this->con instanceof pgsqlConnection)
@@ -86 +87 @@
                }
           }
-
+          
           $this->prefix = $prefix;
-
+          
           $this->error = new dcError();
           $this->auth = $this->authInstance();
           $this->session = new sessionDB($this->con,$this->prefix.'session',DC_SESSION_NAME,'',null,DC_ADMIN_SSL);
           $this->url = new dcUrlHandlers();
-
+          
           $this->plugins = new dcPlugins($this);
-
+          
           $this->rest = new dcRestServer($this);
-
+          
           $this->meta = new dcMeta($this);
-
+          
           $this->log = new dcLog($this);
      }
-
+     
      private function authInstance()
      {
@@ -112 +113 @@
                $c = DC_AUTH_CLASS;
           }
-
+          
           if (!class_exists($c)) {
                throw new Exception('Authentication class '.$c.' does not exist.');
           }
-
+          
           if ($c != 'dcAuth' && !is_subclass_of($c,'dcAuth')) {
                throw new Exception('Authentication class '.$c.' does not inherit dcAuth.');
           }
-
+          
           return new $c($this);
      }
-
-
+     
+     /**
+     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
      //@{
      /**
      Sets a blog to use in <var>blog</var> property.
-
+     
      @param    id        <b>string</b>       Blog ID
      */
@@ -136 +172 @@
           $this->blog = new dcBlog($this, $id);
      }
-
+     
      /**
      Unsets <var>blog</var> property.
@@ -145 +181 @@
      }
      //@}
-
-
+     
+     
      /// @name Blog status methods
      //@{
      /**
      Returns an array of available blog status codes and names.
-
+     
      @return   <b>array</b> Simple array with codes in keys and names in value
      */
@@ -162 +198 @@
           );
      }
-
+     
      /**
      Returns a blog status name given to a code. This is intended to be
      human-readable and will be translated, so never use it for tests.
      If status code does not exist, returns <i>offline</i>.
-
+     
      @param    s    <b>integer</b> Status code
      @return   <b>string</b> Blog status name
@@ -180 +216 @@
      }
      //@}
-
+     
      /// @name Admin nonce secret methods
      //@{
-
+     
      public function getNonce()
      {
           return crypt::hmac(DC_MASTER_KEY,session_id());
      }
-
+     
      public function checkNonce($secret)
      {
@@ -194 +230 @@
                return false;
           }
-
+          
           return $secret == crypt::hmac(DC_MASTER_KEY,session_id());
      }
-
+     
      public function formNonce()
      {
@@ -203 +239 @@
                return;
           }
-
+          
           return form::hidden(array('xd_check'),$this->getNonce());
      }
      //@}
-
+     
      /// @name Text Formatters methods
      //@{
@@ -225 +261 @@
           }
      }
-
+     
      /// @name Text Formatters methods
      //@{
@@ -232 +268 @@
      transform text. The function must be a valid callback and takes one
      argument: the string to transform. It returns the transformed string.
-
+     
      @param    name      <b>string</b>       Formater name
      @param    func      <b>callback</b>     Function to use, must be a valid and callable callback
@@ -256 +292 @@
           return $editors;
      }
-
+     
      /**
      Returns formaters list by editor
-
+     
      @param    editor_id <b>string</b>  Editor id (dcLegacyEditor, dcCKEditor, ...)
      @return   <b>array</b> An array of formaters names in values.
@@ -288 +324 @@
           return $formaters_list;
      }
-
+     
      /**
      If <var>$name</var> is a valid formater, it returns <var>$str</var>
      transformed using that formater.
-
+     
      @param    editor_id <b>string</b>  Editor id (dcLegacyEditor, dcCKEditor, ...)
      @param    name      <b>string</b>       Formater name
@@ -303 +339 @@
                return call_user_func($this->formaters[$editor_id][$name],$str);
           }
-
+          
           return $str;
      }
      //@}
-
+     
      /**
      If <var>$name</var> is a valid formater, it returns <var>$str</var>
@@ -322 +358 @@
      //@}
 
-
+     
      /// @name Behaviors methods
      //@{
@@ -328 +364 @@
      Adds a new behavior to behaviors stack. <var>$func</var> must be a valid
      and callable callback.
-
+     
      @param    behavior  <b>string</b>       Behavior name
      @param    func      <b>callback</b>     Function to call
@@ -338 +374 @@
           }
      }
-
+     
      /**
      Tests if a particular behavior exists in behaviors stack.
-
+     
      @param    behavior  <b>string</b>  Behavior name
      @return   <b>boolean</b>
@@ -349 +385 @@
           return isset($this->behaviors[$behavior]);
      }
-
+     
      /**
      Get behaviors stack (or part of).
-
+     
      @param    behavior  <b>string</b>       Behavior name
      @return   <b>array</b>
@@ -359 +395 @@
      {
           if (empty($this->behaviors)) return null;
-
+          
           if ($behavior == '') {
                return $this->behaviors;
@@ -365 +401 @@
                return $this->behaviors[$behavior];
           }
-
+          
           return array();
      }
-
+     
      /**
      Calls every function in behaviors stack for a given behavior and returns
      concatened result of each function.
-
+     
      Every parameters added after <var>$behavior</var> will be pass to
      behavior calls.
-
+     
      @param    behavior  <b>string</b>  Behavior name
      @return   <b>string</b> Behavior concatened result
@@ -385 +421 @@
                $args = func_get_args();
                array_shift($args);
-
+               
                $res = '';
-
+               
                foreach ($this->behaviors[$behavior] as $f) {
                     $res .= call_user_func_array($f,$args);
                }
-
+               
                return $res;
           }
      }
      //@}
-
+     
      /// @name Post types URLs management
      //@{
@@ -404 +440 @@
                $type = 'post';
           }
-
+          
           $url = sprintf($this->post_types[$type]['admin_url'],$post_id);
           return $escaped ? html::escapeURL($url) : $url;
      }
-
+     
      public function getPostPublicURL($type,$post_url,$escaped=true)
      {
@@ -414 +450 @@
                $type = 'post';
           }
-
+          
           $url = sprintf($this->post_types[$type]['public_url'],$post_url);
           return $escaped ? html::escapeURL($url) : $url;
      }
-
+     
      public function setPostType($type,$admin_url,$public_url,$label='')
      {
@@ -427 +463 @@
           );
      }
-
+     
      public function getPostTypes()
      {
@@ -433 +469 @@
      }
      //@}
-
+     
      /// @name Versions management methods
      //@{
      /**
      Returns a given $module version.
-
+     
      @param    module    <b>string</b>  Module name
      @return   <b>string</b>  Module version
@@ -449 +485 @@
                $strReq = 'SELECT module, version FROM '.$this->prefix.'version';
                $rs = $this->con->select($strReq);
-
+               
                while ($rs->fetch()) {
                     $this->versions[$rs->module] = $rs->version;
                }
           }
-
+          
           if (isset($this->versions[$module])) {
                return $this->versions[$module];
@@ -461 +497 @@
           }
      }
-
+     
      /**
      Sets $version to given $module.
-
+     
      @param    module    <b>string</b>  Module name
      @param    version   <b>string</b>  Module version
@@ -471 +507 @@
      {
           $cur_version = $this->getVersion($module);
-
+          
           $cur = $this->con->openCursor($this->prefix.'version');
           $cur->module = (string) $module;
           $cur->version = (string) $version;
-
+          
           if ($cur_version === null) {
                $cur->insert();
@@ -481 +517 @@
                $cur->update("WHERE module='".$this->con->escape($module)."'");
           }
-
+          
           $this->versions[$module] = $version;
      }
-
+     
      /**
      Removes given $module version entry.
-
+     
      @param    module    <b>string</b>  Module name
      */
@@ -495 +531 @@
           'DELETE FROM '.$this->prefix.'version '.
           "WHERE module = '".$this->con->escape($module)."' ";
-
+          
           $this->con->execute($strReq);
-
+          
           if (is_array($this->versions)) {
                unset($this->versions[$module]);
           }
      }
-
+     
      //@}
-
+     
      /// @name Users management methods
      //@{
      /**
      Returns a user by its ID.
-
+     
      @param    id        <b>string</b>       User ID
      @return   <b>record</b>
@@ -516 +552 @@
      {
           $params['user_id'] = $id;
-
+          
           return $this->getUsers($params);
      }
-
+     
      /**
      Returns a users list. <b>$params</b> is an array with the following
      optionnal parameters:
-
+     
       - <var>q</var>: search string (on user_id, user_name, user_firstname)
       - <var>user_id</var>: user ID
       - <var>order</var>: ORDER BY clause (default: user_id ASC)
       - <var>limit</var>: LIMIT clause (should be an array ![limit,offset])
-
+     
      @param    params         <b>array</b>        Parameters
      @param    count_only     <b>boolean</b>      Only counts results
@@ -553 +589 @@
                'WHERE NULL IS NULL ';
           }
-
+          
           if (!empty($params['q'])) {
                $q = $this->con->escape(str_replace('*','%',strtolower($params['q'])));
@@ -562 +598 @@
                     ') ';
           }
-
+          
           if (!empty($params['user_id'])) {
                $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
           }
-
+          
           if (!$count_only) {
                $strReq .= 'GROUP BY U.user_id,user_super,user_status,user_pwd,user_change_pwd,'.
                'user_name,user_firstname,user_displayname,user_email,user_url,'.
                'user_desc, user_lang,user_tz,user_post_status,user_options ';
-
+               
                if (!empty($params['order']) && !$count_only) {
                     $strReq .= 'ORDER BY '.$this->con->escape($params['order']).' ';
@@ -578 +614 @@
                }
           }
-
+          
           if (!$count_only && !empty($params['limit'])) {
                $strReq .= $this->con->limit($params['limit']);
           }
-
+          
           $rs = $this->con->select($strReq);
           $rs->extend('rsExtUser');
           return $rs;
      }
-
+     
      /**
      Create a new user. Takes a cursor as input and returns the new user ID.
-
+     
      @param    cur       <b>cursor</b>       User cursor
      @return   <b>string</b>
@@ -599 +635 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           if ($cur->user_id == '') {
                throw new Exception(__('No user ID given'));
           }
-
+          
           if ($cur->user_pwd == '') {
                throw new Exception(__('No password given'));
           }
-
+          
           $this->getUserCursor($cur);
-
+          
           if ($cur->user_creadt === null) {
                $cur->user_creadt = date('Y-m-d H:i:s');
           }
-
+          
           $cur->insert();
-
+          
           $this->auth->afterAddUser($cur);
-
+          
           return $cur->user_id;
      }
-
+     
      /**
      Updates an existing user. Returns the user ID.
-
+     
      @param    id        <b>string</b>       User ID
      @param    cur       <b>cursor</b>       User cursor
@@ -631 +667 @@
      {
           $this->getUserCursor($cur);
-
+          
           if (($cur->user_id !== null || $id != $this->auth->userID()) &&
           !$this->auth->isSuperAdmin()) {
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $cur->update("WHERE user_id = '".$this->con->escape($id)."' ");
-
+          
           $this->auth->afterUpdUser($id,$cur);
-
+          
           if ($cur->user_id !== null) {
                $id = $cur->user_id;
           }
-
+          
           # Updating all user's blogs
           $rs = $this->con->select(
@@ -650 +686 @@
                "WHERE user_id = '".$this->con->escape($id)."' "
                );
-
+          
           while ($rs->fetch()) {
                $b = new dcBlog($this,$rs->blog_id);
@@ -656 +692 @@
                unset($b);
           }
-
+          
           return $id;
      }
-
+     
      /**
      Deletes a user.
-
+     
      @param    id        <b>string</b>       User ID
      */
@@ -670 +706 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           if ($id == $this->auth->userID()) {
                return;
           }
-
+          
           $rs = $this->getUser($id);
-
+          
           if ($rs->nb_post > 0) {
                return;
           }
-
+          
           $strReq = 'DELETE FROM '.$this->prefix.'user '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $this->con->execute($strReq);
-
+          
           $this->auth->afterDelUser($id);
      }
-
+     
      /**
      Checks whether a user exists.
-
+     
      @param    id        <b>string</b>       User ID
      @return   <b>boolean</b>
@@ -700 +736 @@
                     'FROM '.$this->prefix.'user '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $rs = $this->con->select($strReq);
-
+          
           return !$rs->isEmpty();
      }
-
+     
      /**
      Returns all user permissions as an array which looks like:
-
+     
       - [blog_id]
         - [name] => Blog name
         - [url] => Blog URL
         - [p]
-          - [permission] => true
+          - [permission] => true
           - ...
-
+     
      @param    id        <b>string</b>       User ID
      @return   <b>array</b>
@@ -725 +761 @@
                     'INNER JOIN '.$this->prefix.'blog B ON P.blog_id = B.blog_id '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $res = array();
-
+          
           while ($rs->fetch())
           {
@@ -738 +774 @@
                );
           }
-
+          
           return $res;
      }
-
+     
      /**
      Sets user permissions. The <var>$perms</var> array looks like:
-
+     
       - [blog_id] => '|perm1|perm2|'
       - ...
-
+     
      @param    id        <b>string</b>       User ID
      @param    perms     <b>array</b>        Permissions array
@@ -756 +792 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $strReq = 'DELETE FROM '.$this->prefix.'permissions '.
                     "WHERE user_id = '".$this->con->escape($id)."' ";
-
+          
           $this->con->execute($strReq);
-
+          
           foreach ($perms as $blog_id => $p) {
                $this->setUserBlogPermissions($id, $blog_id, $p, false);
           }
      }
-
+     
      /**
      Sets user permissions for a given blog. <var>$perms</var> is an array with
      permissions in values
-
+     
      @param    id             <b>string</b>       User ID
      @param    blog_id        <b>string</b>       Blog ID
@@ -781 +817 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $no_perm = empty($perms);
-
+          
           $perms = '|'.implode('|',array_keys($perms)).'|';
-
+          
           $cur = $this->con->openCursor($this->prefix.'permissions');
-
+          
           $cur->user_id = (string) $id;
           $cur->blog_id = (string) $blog_id;
           $cur->permissions = $perms;
-
+          
           if ($delete_first || $no_perm)
           {
@@ -797 +833 @@
                          "WHERE blog_id = '".$this->con->escape($blog_id)."' ".
                          "AND user_id = '".$this->con->escape($id)."' ";
-
+               
                $this->con->execute($strReq);
           }
-
+          
           if (!$no_perm) {
                $cur->insert();
           }
      }
-
+     
      /**
      Sets a user default blog. This blog will be selected when user log in.
-
+     
      @param    id             <b>string</b>       User ID
      @param    blog_id        <b>string</b>       Blog ID
@@ -815 +851 @@
      {
           $cur = $this->con->openCursor($this->prefix.'user');
-
+          
           $cur->user_default_blog = (string) $blog_id;
-
+          
           $cur->update("WHERE user_id = '".$this->con->escape($id)."'");
      }
-
+     
      private function getUserCursor($cur)
      {
@@ -827 +863 @@
                throw new Exception(__('User ID must contain at least 2 characters using letters, numbers or symbols.'));
           }
-
+          
           if ($cur->user_url !== null && $cur->user_url != '') {
                if (!preg_match('|^http(s?)://|',$cur->user_url)) {
@@ -833 +869 @@
                }
           }
-
+          
           if ($cur->isField('user_pwd')) {
                if (strlen($cur->user_pwd) < 6) {
@@ -840 +876 @@
                $cur->user_pwd = crypt::hmac(DC_MASTER_KEY,$cur->user_pwd);
           }
-
+          
           if ($cur->user_lang !== null && !preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$cur->user_lang)) {
                throw new Exception(__('Invalid user language code'));
           }
-
+          
           if ($cur->user_upddt === null) {
                $cur->user_upddt = date('Y-m-d H:i:s');
           }
-
+          
           if ($cur->user_options !== null) {
                $cur->user_options = serialize((array) $cur->user_options);
           }
      }
-
+     
      /**
      Returns user default settings in an associative array with setting names in
      keys.
-
+     
      @return   <b>array</b>
      */
@@ -870 +906 @@
      }
      //@}
-
+     
      /// @name Blog management methods
      //@{
      /**
      Returns all blog permissions (users) as an array which looks like:
-
+     
       - [user_id]
         - [name] => User name
@@ -882 +918 @@
         - [super] => (true|false) super admin
         - [p]
-          - [permission] => true
+          - [permission] => true
           - ...
-
+     
      @param    id             <b>string</b>       Blog ID
      @param    with_super     <b>boolean</b>      Includes super admins in result
@@ -897 +933 @@
           'JOIN '.$this->prefix.'permissions P ON U.user_id = P.user_id '.
           "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           if ($with_super) {
                $strReq .=
@@ -906 +942 @@
                'WHERE user_super = 1 ';
           }
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $res = array();
-
+          
           while ($rs->fetch())
           {
@@ -922 +958 @@
                );
           }
-
+          
           return $res;
      }
-
+     
      /**
      Returns a blog of given ID.
-
+     
      @param    id        <b>string</b>       Blog ID
      @return   <b>record</b>
@@ -935 +971 @@
      {
           $blog = $this->getBlogs(array('blog_id'=>$id));
-
+          
           if ($blog->isEmpty()) {
                return false;
           }
-
+          
           return $blog;
      }
-
+     
      /**
      Returns a record of blogs. <b>$params</b> is an array with the following
      optionnal parameters:
-
+     
       - <var>blog_id</var>: Blog ID
       - <var>q</var>: Search string on blog_id, blog_name and blog_url
       - <var>limit</var>: limit results
-
+     
      @param    params         <b>array</b>        Parameters
      @param    count_only     <b>boolean</b>      Count only results
@@ -959 +995 @@
           $join = '';    // %1$s
           $where = '';   // %2$s
-
+          
           if ($count_only)
           {
@@ -977 +1013 @@
                'WHERE NULL IS NULL '.
                '%2$s ';
-
+               
                if (!empty($params['order'])) {
                     $strReq .= 'ORDER BY '.$this->con->escape($params['order']).' ';
@@ -983 +1019 @@
                     $strReq .= 'ORDER BY B.blog_id ASC ';
                }
-
+               
                if (!empty($params['limit'])) {
                     $strReq .= $this->con->limit($params['limit']);
                }
           }
-
+          
           if ($this->auth->userID() && !$this->auth->isSuperAdmin())
           {
@@ -999 +1035 @@
                $where = 'AND blog_status IN (1,0) ';
           }
-
+          
           if (!empty($params['blog_id'])) {
                $where .= "AND B.blog_id = '".$this->con->escape($params['blog_id'])."' ";
           }
-
+          
           if (!empty($params['q'])) {
                $params['q'] = strtolower(str_replace('*','%',$params['q']));
@@ -1013 +1049 @@
                ') ';
           }
-
+          
           $strReq = sprintf($strReq,$join,$where);
           return $this->con->select($strReq);
      }
-
+     
      /**
      Creates a new blog.
-
+     
      @param    cur            <b>cursor</b>       Blog cursor
      */
@@ -1028 +1064 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $this->getBlogCursor($cur);
-
+          
           $cur->blog_creadt = date('Y-m-d H:i:s');
           $cur->blog_upddt = date('Y-m-d H:i:s');
           $cur->blog_uid = md5(uniqid());
-
+          
           $cur->insert();
      }
-
+     
      /**
      Updates a given blog.
-
+     
      @param    id        <b>string</b>       Blog ID
      @param    cur       <b>cursor</b>       Blog cursor
@@ -1047 +1083 @@
      {
           $this->getBlogCursor($cur);
-
+          
           $cur->blog_upddt = date('Y-m-d H:i:s');
-
+          
           $cur->update("WHERE blog_id = '".$this->con->escape($id)."'");
      }
-
+     
      private function getBlogCursor($cur)
      {
@@ -1058 +1094 @@
                && !preg_match('/^[A-Za-z0-9._-]{2,}$/',$cur->blog_id)) ||
                (!$cur->blog_id)) {
-               throw new Exception(__('Blog ID must contain at least 2 characters using letters, numbers or symbols.'));
-          }
-
+               throw new Exception(__('Blog ID must contain at least 2 characters using letters, numbers or symbols.')); 
+          }
+          
           if (($cur->blog_name !== null && $cur->blog_name == '') ||
                (!$cur->blog_name)) {
                throw new Exception(__('No blog name'));
           }
-
+          
           if (($cur->blog_url !== null && $cur->blog_url == '') ||
                (!$cur->blog_url)) {
                throw new Exception(__('No blog URL'));
           }
-
+          
           if ($cur->blog_desc !== null) {
                $cur->blog_desc = html::clean($cur->blog_desc);
           }
      }
-
+     
      /**
      Removes a given blog.
      @warning This will remove everything related to the blog (posts,
      categories, comments, links...)
-
+     
      @param    id        <b>string</b>       Blog ID
      */
@@ -1088 +1124 @@
                throw new Exception(__('You are not an administrator'));
           }
-
+          
           $strReq = 'DELETE FROM '.$this->prefix.'blog '.
                     "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           $this->con->execute($strReq);
      }
-
+     
      /**
      Checks if a blog exist.
-
+     
      @param    id        <b>string</b>       Blog ID
      @return   <b>boolean</b>
@@ -1106 +1142 @@
                     'FROM '.$this->prefix.'blog '.
                     "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           $rs = $this->con->select($strReq);
-
+          
           return !$rs->isEmpty();
      }
-
+     
      /**
      Count posts on a blog
-
+     
      @param    id        <b>string</b>       Blog ID
      @param    type      <b>string</b>       Post type
@@ -1124 +1160 @@
                     'FROM '.$this->prefix.'post '.
                     "WHERE blog_id = '".$this->con->escape($id)."' ";
-
+          
           if ($type) {
                $strReq .= "AND post_type = '".$this->con->escape($type)."' ";
           }
-
+          
           return $this->con->select($strReq)->f(0);
      }
      //@}
-
+     
      /// @name HTML Filter methods
      //@{
@@ -1139 +1175 @@
      tidy extension is present). If <b>enable_html_filter</b> blog setting is
      false, returns not filtered string.
-
+     
      @param    str  <b>string</b>       String to filter
      @return   <b>string</b> Filtered string.
@@ -1148 +1184 @@
                return $str;
           }
-
+          
           $filter = new htmlFilter;
           $str = trim($filter->apply($str));
@@ -1154 +1190 @@
      }
      //@}
-
+     
      /// @name wiki2xhtml methods
      //@{
@@ -1161 +1197 @@
           $this->wiki2xhtml = new wiki2xhtml;
      }
-
+     
      /**
      Returns a transformed string with wiki2xhtml.
-
+     
      @param    str       <b>string</b>       String to transform
      @return   <b>string</b>  Transformed string
@@ -1175 +1211 @@
           return $this->wiki2xhtml->transform($str);
      }
-
+     
      /**
      Inits <var>wiki2xhtml</var> property for blog post.
@@ -1182 +1218 @@
      {
           $this->initWiki();
-
+          
           $this->wiki2xhtml->setOpts(array(
                'active_title' => 1,
@@ -1214 +1250 @@
                'note_str' => '<div class="footnotes"><h4>Notes</h4>%s</div>'
           ));
-
+          
           $this->wiki2xhtml->registerFunction('url:post',array($this,'wikiPostLink'));
-
+          
           # --BEHAVIOR-- coreWikiPostInit
           $this->callBehavior('coreInitWikiPost',$this->wiki2xhtml);
      }
-
+     
      /**
      Inits <var>wiki2xhtml</var> property for simple blog comment (basic syntax).
@@ -1227 +1263 @@
      {
           $this->initWiki();
-
+          
           $this->wiki2xhtml->setOpts(array(
                'active_title' => 0,
@@ -1256 +1292 @@
                'active_fr_syntax' => 0
           ));
-
+          
           # --BEHAVIOR-- coreInitWikiSimpleComment
           $this->callBehavior('coreInitWikiSimpleComment',$this->wiki2xhtml);
      }
-
+     
      /**
      Inits <var>wiki2xhtml</var> property for blog comment.
@@ -1267 +1303 @@
      {
           $this->initWiki();
-
+          
           $this->wiki2xhtml->setOpts(array(
                'active_title' => 0,
@@ -1296 +1332 @@
                'active_fr_syntax' => 0
           ));
-
+          
           # --BEHAVIOR-- coreInitWikiComment
           $this->callBehavior('coreInitWikiComment',$this->wiki2xhtml);
      }
-
+     
      public function wikiPostLink($url,$content)
      {
-          if (!($this->blog instanceof dcBlog)) {
+          if (!($this->blog instanceof dcBlog)) { 
                return array();
           }
-
+          
           $post_id = abs((integer) substr($url,5));
           if (!$post_id) {
                return array();
           }
-
+          
           $post = $this->blog->getPosts(array('post_id'=>$post_id));
           if ($post->isEmpty()) {
                return array();
           }
-
+          
           $res = array('url' => $post->getURL());
           $post_title = $post->post_title;
-
+          
           if ($content != $url) {
                $res['title'] = html::escapeHTML($post->post_title);
           }
-
+          
           if ($content == '' || $content == $url) {
                $res['content'] = html::escapeHTML($post->post_title);
           }
-
+          
           if ($post->post_lang) {
                $res['lang'] = $post->post_lang;
           }
-
+          
           return $res;
      }
      //@}
-
+     
      /// @name Maintenance methods
      //@{
@@ -1341 +1377 @@
      Creates default settings for active blog. Optionnal parameter
      <var>defaults</var> replaces default params while needed.
-
+     
      @param    defaults       <b>array</b>   Default parameters
      */
@@ -1426 +1462 @@
                );
           }
-
+          
           $settings = new dcSettings($this,null);
           $settings->addNamespace('system');
-
+          
           foreach ($defaults as $v) {
                $settings->system->put($v[0],$v[2],$v[1],$v[3],false,true);
           }
      }
-
+     
      /**
      Recreates entries search engine index.
-
+     
      @param    start     <b>integer</b>      Start entry index
      @param    limit     <b>integer</b>      Number of entry to index
-
+     
      @return   <b>integer</b>      <var>$start</var> and <var>$limit</var> sum
      */
@@ -1449 +1485 @@
           $rs = $this->con->select($strReq);
           $count = $rs->f(0);
-
+          
           $strReq = 'SELECT post_id, post_title, post_excerpt_xhtml, post_content_xhtml '.
                     'FROM '.$this->prefix.'post ';
-
+          
           if ($start !== null && $limit !== null) {
                $strReq .= $this->con->limit($start,$limit);
           }
-
+          
           $rs = $this->con->select($strReq,true);
-
+          
           $cur = $this->con->openCursor($this->prefix.'post');
-
+          
           while ($rs->fetch())
           {
                $words = $rs->post_title.' '. $rs->post_excerpt_xhtml.' '.
                $rs->post_content_xhtml;
-
+               
                $cur->post_words = implode(' ',text::splitWords($words));
                $cur->update('WHERE post_id = '.(integer) $rs->post_id);
                $cur->clean();
           }
-
+          
           if ($start+$limit > $count) {
                return null;
@@ -1476 +1512 @@
           return $start+$limit;
      }
-
+     
      /**
      Recreates comments search engine index.
-
+     
      @param    start     <b>integer</b>      Start comment index
      @param    limit     <b>integer</b>      Number of comments to index
-
+     
      @return   <b>integer</b>      <var>$start</var> and <var>$limit</var> sum
      */
@@ -1491 +1527 @@
           $rs = $this->con->select($strReq);
           $count = $rs->f(0);
-
+          
           $strReq = 'SELECT comment_id, comment_content '.
                     'FROM '.$this->prefix.'comment ';
-
+          
           if ($start !== null && $limit !== null) {
                $strReq .= $this->con->limit($start,$limit);
           }
-
+          
           $rs = $this->con->select($strReq);
-
+          
           $cur = $this->con->openCursor($this->prefix.'comment');
-
+          
           while ($rs->fetch())
           {
@@ -1509 +1545 @@
                $cur->clean();
           }
-
+          
           if ($start+$limit > $count) {
                return null;
@@ -1515 +1551 @@
           return $start+$limit;
      }
-
+     
      /**
      Reinits nb_comment and nb_trackback in post table.
@@ -1521 +1557 @@
      public function countAllComments()
      {
-
+     
           $updCommentReq = 'UPDATE '.$this->prefix.'post P '.
                'SET nb_comment = ('.
@@ -1537 +1573 @@
           $this->con->execute($updTrackbackReq);
      }
-
+     
      /**
      Empty templates cache directory
@@ -1550 +1586 @@
      /**
       Return elapsed time since script has been started
-      @param     $mtime <b>float</b> timestamp (microtime format) to evaluate delta from
-                                          current time is taken if null
-      @return <b>float</b>          elapsed time
+      @param   $mtime <b>float</b> timestamp (microtime format) to evaluate delta from
+                                     current time is taken if null
+      @return <b>float</b>        elapsed time
       */
      public function getElapsedTime ($mtime=null) {