Changeset 3262:d7ae7e24da60

Timestamp:

07/02/16 10:12:25 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

some stuff missing, thanks Gvx for suggestion, addresses #236

Location:

inc

Files:

• admin/lib.dc.page.php (modified) (1 diff)
• admin/prepend.php (modified) (1 diff)
• core/class.dc.blog.php (modified) (1 diff)
• load_var_file.php (modified) (1 diff)

inc/admin/lib.dc.page.php

@@ -1007 +1007 @@
      }
 
+     public static function getVF($file)
+     {
+          return $GLOBALS['core']->adminurl->get('load.var.file',array('vf' => $file));
+     }
+
      public static function setXFrameOptions($origin = null)
      {

inc/admin/prepend.php

@@ -208 +208 @@
 
 $core->adminurl->registercopy('load.plugin.file','admin.home',array('pf' => 'dummy.css'));
+$core->adminurl->registercopy('load.var.file','admin.home',array('vf' => 'dummy.json'));
 
 if ($core->auth->userID() && $core->blog !== null)

inc/core/class.dc.blog.php

@@ -138 +138 @@
      {
           $ret = $this->getQmarkURL().'pf='.$pf;
+          if ($strip_host) {
+               $ret = html::stripHostURL($ret);
+          }
+          return $ret;
+     }
+
+     /**
+     Returns public URL of specified var file.
+      */
+     public function getVF($vf, $strip_host=true)
+     {
+          $ret = $this->getQmarkURL().'vf='.$vf;
           if ($strip_host) {
                $ret = html::stripHostURL($ret);

inc/load_var_file.php

@@ -62 +62 @@
 }
 
-$allow_types = array('png','jpg','jpeg','gif','css','js','swf','svg','html');
+$allow_types = array('png','jpg','jpeg','gif','css','js','swf','svg','html','xml','json','txt');
 
 $vf = path::clean($_GET['vf']);