Changes in inc/core/class.dc.core.php [2566:9bf417837888:2596:62f32566c15f]

File:

• inc/core/class.dc.core.php (modified) (5 diffs)

inc/core/class.dc.core.php

@@ -39 +39 @@
      public $rest;       ///< <b>dcRestServer</b> dcRestServer object
      public $log;        ///< <b>dcLog</b>             dcLog object
+     public $stime;      ///< <b>float</b>             starting time
 
      private $versions = null;
@@ -59 +60 @@
      public function __construct($driver, $host, $db, $user, $password, $prefix, $persist)
      {
+          if (defined('DC_START_TIME')) {
+               $this->stime=DC_START_TIME;
+          } else {
+               $this->stime = microtime(true);
+          }
+
           $this->con = dbLayer::init($driver,$host,$db,$user,$password,$persist);
 
@@ -982 +989 @@
      private function getBlogCursor($cur)
      {
-          if ($cur->blog_id !== null
-          && !preg_match('/^[A-Za-z0-9._-]{2,}$/',$cur->blog_id)) {
+          if (($cur->blog_id !== null
+               && !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.'));
           }
 
-          if ($cur->blog_name !== null && $cur->blog_name == '') {
+          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 == '') {
+          if (($cur->blog_url !== null && $cur->blog_url == '') ||
+               (!$cur->blog_url)) {
                throw new Exception(__('No blog URL'));
           }
@@ -1306 +1316 @@
                     array('media_img_title_pattern','string','Title ;; Date(%b %Y) ;; separator(, )',
                     'Pattern to set image title when you insert it in a post'),
+                    array('nb_post_for_home','integer',20,
+                    'Number of entries on first home page'),
                     array('nb_post_per_page','integer',20,
-                    'Number of entries on home page and category pages'),
+                    'Number of entries on home pages and category pages'),
                     array('nb_post_per_feed','integer',20,
                     'Number of entries on feeds'),
@@ -1469 +1481 @@
           }
      }
+
+     /**
+      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
+      */
+     public function getElapsedTime ($mtime=null) {
+          if ($mtime !== null) {
+               return $mtime-$this->stime;
+          } else {
+               return microtime(true)-$this->stime;
+          }
+     }
      //@}
+
+
+
 }