more defaults for templates

diff --git a/ipf/context.php b/ipf/context.php
deleted file mode 100644 (file)
index 1b014ae..0000000
--- a/ipf/context.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-function IPF_Context_Auth($request)
-{
-    return array('user' => $request->user);
-}
-
-function IPF_Context_Media($request)
-{
-    return array('MEDIA_URL' => IPF::get('media_url'));
-}
-
-function IPF_Context_Upload($request)
-{
-    return array('UPLOAD_URL' => IPF::getUploadUrl());
-}
-
-function IPF_Context_Current($request)
-{
-    return array('CURRENT_URL' => $request->query);
-}
-

diff --git a/ipf/project_template.php b/ipf/project_template.php
index 42d42fcbd8e064618437cc746141ba1650669fe8..b336a8e06e7c947a1a9045041eeb1557d9d3196b 100644 (file)
--- a/ipf/project_template.php
+++ b/ipf/project_template.php
@@ -43,11 +43,20 @@ final class IPF_Project_Template
     public static function context($params=array(), $request=null)
     {
         if ($request) {
-            $params = array_merge(array('request' => $request), $params);
+            $params = array_merge(array(
+                    'request'     => $request,
+                    'user'        => $request->user,
+                    'STATIC_URL'  => IPF::get('static_url'),
+                    'MEDIA_URL'   => IPF::get('media_url'),
+                    'UPLOAD_URL'  => IPF::getUploadUrl(),
+                    'CURRENT_URL' => $request->query,
+                ), $params);
+
             foreach (IPF::get('template_context_processors', array()) as $proc) {
                 $c = IPF::callFunction($proc, array($request));
                 $params = array_merge($c, $params);
             }
+
             foreach (IPF_Project::getInstance()->appList() as $app) {
                 $params = array_merge($app->templateContext($request), $params);
             }