Updating core code to allow public pages using new Walled Garden functionality.

git-svn-id: http://code.elgg.org/elgg/trunk@6047 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/_css/css.php b/_css/css.php
index c2b2cfbc7159635817688048eb5a36d26b78c143..6d240351c809348142afb39ecc1c4fbd80f4912b 100644 (file)
--- a/_css/css.php
+++ b/_css/css.php
@@ -8,33 +8,14 @@
  * @link http://elgg.org/
  */
 
-/*
-
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-$default_css = elgg_view("css");
-
-header("Content-type: text/css", true);
-header('Expires: ' . date('r',time() + 864000), true);
-header("Pragma: public", true);
-header("Cache-Control: public", true);
-header("Content-Length: " . strlen($default_css));
-
-echo $default_css;
-*/
-
-define('externalpage',true);
-
 global $viewinput, $override;
+
 $viewinput['view'] = 'css';
 $viewinput['viewtype'] = $_GET['viewtype'];
 
-//$override = true;
-
 header("Content-type: text/css", true);
 header('Expires: ' . date('r',time() + 86400000), true);
 header("Pragma: public", true);
 header("Cache-Control: public", true);
 
-// header("Content-Length: " . strlen($default_css));
 require_once(dirname(dirname(__FILE__)) . '/simplecache/view.php');

diff --git a/_css/js.php b/_css/js.php
index 8ffb7945e78748413cb2f99cc2ffb416153a483f..6eb05642619b89f41d09ed57b1705da0d09260c7 100644 (file)
--- a/_css/js.php
+++ b/_css/js.php
@@ -8,25 +8,8 @@
  * @link http://elgg.org/
  */
 
-/*
-
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
-$default_css = elgg_view("css");
-
-header("Content-type: text/css", true);
-header('Expires: ' . date('r',time() + 864000), true);
-header("Pragma: public", true);
-header("Cache-Control: public", true);
-header("Content-Length: " . strlen($default_css));
-
-echo $default_css;
-*/
-
-define('externalpage',true);
-
 global $viewinput, $override;
-//$override = true;
+
 $viewinput['view'] = 'js/' . $_GET['js'];
 $viewinput['viewtype'] = $_GET['viewtype'];
 
@@ -34,6 +17,5 @@ header('Content-type: text/javascript');
 header('Expires: ' . date('r',time() + 864000000));
 header("Pragma: public");
 header("Cache-Control: public");
-// header("Content-Length: " . strlen($return));
 
 require_once(dirname(dirname(__FILE__)) . '/simplecache/view.php');
\ No newline at end of file

diff --git a/engine/handlers/action_handler.php b/engine/handlers/action_handler.php
index 52c1a2633dea9dd5d722a27b9f38d23409e55860..f99e1efdc02e8b98e4f6ca3c5cf3901c6361ff91 100644 (file)
--- a/engine/handlers/action_handler.php
+++ b/engine/handlers/action_handler.php
@@ -12,7 +12,6 @@
 /**
  *  Load Elgg framework
  */
-define('externalpage',true);
 require_once("../start.php");
 $action = get_input("action");
 action($action);
\ No newline at end of file

diff --git a/engine/handlers/cron_handler.php b/engine/handlers/cron_handler.php
index 37a0335f6ce42e9132ecd7123a9c56fefb46e728..a86cf7f4c2a8af49febbc0f24411f2d438f04026 100644 (file)
--- a/engine/handlers/cron_handler.php
+++ b/engine/handlers/cron_handler.php
@@ -9,7 +9,6 @@
  */
 
 // Load Elgg engine
-define('externalpage',true);
 require_once("../start.php");
 global $CONFIG;
 

diff --git a/engine/handlers/pagehandler.php b/engine/handlers/pagehandler.php
index a0837caa183bccdf7d37e1884fef91f5c5f99fe0..24bef4d0344b5189f7f2d23a9c4a8c8e5658cb8d 100644 (file)
--- a/engine/handlers/pagehandler.php
+++ b/engine/handlers/pagehandler.php
@@ -9,7 +9,6 @@
  */
 
 // Load Elgg engine
-// define('externalpage',true);
 require_once("../start.php");
 
 // Get input

diff --git a/engine/handlers/service_handler.php b/engine/handlers/service_handler.php
index 51ec2a689920f7014c133c7c434975e14889a63f..4cc54a987702bdcff56f8363e7509dd5c6abfda6 100644 (file)
--- a/engine/handlers/service_handler.php
+++ b/engine/handlers/service_handler.php
@@ -10,7 +10,6 @@
 
 
 // Load Elgg engine
-define('externalpage',true);
 require_once("../start.php");
 
 // Get input

diff --git a/engine/handlers/xml-rpc_handler.php b/engine/handlers/xml-rpc_handler.php
index 26c1454bf697c4ea7136cdd1329affd3a7b7d00f..67d99a6acec28aab5a010611c0e4a7e0ac205f03 100644 (file)
--- a/engine/handlers/xml-rpc_handler.php
+++ b/engine/handlers/xml-rpc_handler.php
@@ -9,7 +9,6 @@
  */
 
 // Load Elgg engine
-define('externalpage',true);
 require_once("../start.php");
 global $CONFIG;
 

diff --git a/engine/lib/cron.php b/engine/lib/cron.php
index b4952e2ee2b9848668da29172f67f2d3c7a3445e..75897fb21ebdaa01e6847981883202f0489d7ea6 100644 (file)
--- a/engine/lib/cron.php
+++ b/engine/lib/cron.php
@@ -18,6 +18,9 @@ class CronException extends Exception {}
 function cron_init() {
        // Register a pagehandler for cron
        register_page_handler('cron','cron_page_handler');
+       
+       // register a hook for Walled Garden public pages
+       register_plugin_hook('public_pages', 'walled_garden', 'cron_public_pages');
 }
 
 /**
@@ -53,5 +56,22 @@ function cron_page_handler($page) {
        }
 }
 
+function cron_public_pages($hook, $type, $return_value, $params) {
+       global $CONFIG;
+       
+       $return_value[] = "{$CONFIG->url}pg/cron/minute";
+       $return_value[] = "{$CONFIG->url}pg/cron/fiveminute";
+       $return_value[] = "{$CONFIG->url}pg/cron/fifteenmin";
+       $return_value[] = "{$CONFIG->url}pg/cron/halfhour";
+       $return_value[] = "{$CONFIG->url}pg/cron/hourly";
+       $return_value[] = "{$CONFIG->url}pg/cron/daily";
+       $return_value[] = "{$CONFIG->url}pg/cron/weekly";
+       $return_value[] = "{$CONFIG->url}pg/cron/monthly";
+       $return_value[] = "{$CONFIG->url}pg/cron/yearly";
+       $return_value[] = "{$CONFIG->url}pg/cron/reboot";
+       
+       return $return_value;
+}
+
 // Register a startup event
 register_elgg_event_handler('init','system','cron_init');
\ No newline at end of file

diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index fb9b66725caebb7e17cfb91bd6a9f65ede076e28..fb47dc012c01bbed1c0f7ca0d2b30fc321ec679b 100644 (file)
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -279,6 +279,8 @@ class ElggSite extends ElggEntity {
                        "{$CONFIG->url}action/user/requestnewpassword",
                        "{$CONFIG->url}pg/resetpassword",
                        "{$CONFIG->url}upgrade.php",
+                       "{$CONFIG->url}xml-rpc.php",
+                       "{$CONFIG->url}mt/mt-xmlrpc.cgi",
                );
                
                // include a hook for plugin authors to include public pages

diff --git a/index.php b/index.php
index 72ae9b616a3dd7bc3ca3f6ca06155552fb4a3214..8787d22c0e026b5fe8bbeaceef059c857f7165c4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -11,7 +11,6 @@
 /**
  * Start the Elgg engine
  */
-define('externalpage', TRUE);
 require_once(dirname(__FILE__) . "/engine/start.php");
 
 if (!trigger_plugin_hook('index', 'system', null, FALSE)) {

diff --git a/mod/externalpages/read.php b/mod/externalpages/read.php
index 466c3a0bea71285d37c4b5e573bbec05f9223468..d8d0eb007a39dd596ae7be8beb95ff92dc144bad 100644 (file)
--- a/mod/externalpages/read.php
+++ b/mod/externalpages/read.php
@@ -10,7 +10,6 @@
 */
 
 // Load Elgg engine
-define('externalpage',true);
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // set some variables

diff --git a/upgrade.php b/upgrade.php
index af06552cd748470902229e35144b989b796e1398..d659d415c9e733b5ef714ffb326ac366e57ff462 100644 (file)
--- a/upgrade.php
+++ b/upgrade.php
@@ -13,7 +13,6 @@
 
 // Include elgg engine
 define('upgrading','upgrading');
-define('externalpage',true);
 require_once(dirname(__FILE__) . "/engine/start.php");
 
 if (get_input('upgrade') == 'upgrade') {