Changeset 1307

Timestamp:

11/22/07 17:21:31 (9 months ago)

Author:

rho

Message:

Patch #171, new function templates_page_output()

Signed-off: Rolando Espinoza La Fuente <rho@prosoftpeople.com>

Files:

• devel/index.php (modified) (1 diff)
• devel/lib/elgglib.php (modified) (2 diffs)
• devel/lib/templates.php (modified) (1 diff)
• devel/login/index.php (modified) (1 diff)
• devel/mod/generic_comments/lib.php (modified) (1 diff)
• devel/profile/edit.php (modified) (1 diff)
• devel/profile/index.php (modified) (1 diff)

devel/index.php

@@ -6 +6 @@
-    templates_page_setup();
-    if (logged_on) {
-
-
-
-
+
-    } else {
-
-
-
-
+
-    }
-    
-    echo templates_page_draw( array(
-                    $CFG->sitename,
-                    $body
-            )
-            );
-            
-?>

devel/lib/elgglib.php

@@ -1073 +1073 @@
- * @return string The remote IP address
- */
- 
+
-    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
-        return cleanremoteaddr($_SERVER['HTTP_CLIENT_IP']);
@@ -4371 +4371 @@
-}
-
+/**
+ * Returns an array of results from each relevant module
+ *
+ * This function runs the specified hook function for each module
+ * that has the hook (possibly restricted to a supplied list of module names). 
+ *
+ * @param string $hook the name of the module hook we want to invoke
+ * @param int  $object_id the object id to apply the hook to (can be empty)
+ * @param string  $object_type the type of the object to apply the hook to (can be empty)
+ * @param array $modules an array of module names (can be empty)
+ * @param array $modules an array of values keyed by keyed by parameter names to pass to the hook function (can be empty)
+ * @return array an array of results keyed by module name
+ */
+
+function action($hook,$object_id=0, $object_type='', $modules = NULL, $parameters = NULL ) {
+    global $CFG;
+
+    $results = array();
+    if (!$modules) {
+        //if (!$CFG->plugins) {
+            $CFG->plugins = get_list_of_plugins('mod');
+        //}
+        $modules = $CFG->plugins;
+    }
+    foreach ($modules as $mod) {
+        $mod_function = $mod . '_'.$hook;
+        if (function_exists($mod_function)) {
+           if ($parameters) {
+                $results[$mod] = $mod_function($object_id,$object_type,$parameters);
+            } else {
+                $results[$mod] = $mod_function($object_id,$object_type);
+            }
+        }
+    }
+    
+    return $results;
+}
+
-?>

devel/lib/templates.php

@@ -1589 +1589 @@
-}
-
+/**
+ * Outputs html page
+ * @param string $title   The title of the page
+ * @param string $body    The body of the content    
+ * @param string $context Optional template context
+ * @param string $sidebar Optional sidebar content 
+ */
+function templates_page_output($title, $body, $context='contentholder', $sidebar=null) {
+    // hook pre-output page
+    // @rho i think no needed because there is already
+    //      _init and _pagesetup
+
+    // allow title with html tags or specialchars
+    $body = templates_draw(array(
+        'context' => $context,
+        'title' => $title,
+        'body' => $body,
+        ));
+
+    // clean title for <title> tag
+    $title = htmlspecialchars_decode(strip_tags($title), ENT_COMPAT);
+
+    // print output!
+    echo templates_page_draw(array($title, $body, $sidebar));
+
+    // hook post-output
+    action('end');
+
+    // end execution
+    exit();
+}
+
+// backward compatiblity for php < 5
+if (!function_exists('htmlspecialchars_decode')) {
+    function htmlspecialchars_decode($string, $quote_style=ENT_COMPAT) {
+        return strtr($string, array_flip(get_html_translation_table(HTML_SPECIALCHARS/*, $quote_style*/)));
+    }
+}
+
+
-?>

devel/login/index.php

@@ -50 +50 @@
-templates_page_setup();
-// display the form.
-
-
-
-
-
-
-
-
-
-
+
-
-?>

devel/mod/generic_comments/lib.php

@@ -601 +601 @@
-}
-
-// this is a temporary location - the code should be moved into elgglib
-
-/**
- * Returns an array of results from each relevant module
- *
- * This function runs the specified hook function for each module
- * that has the hook (possibly restricted to a supplied list of module names). 
- *
- * @param string $hook the name of the module hook we want to invoke
- * @param int  $object_id the object id to apply the hook to (can be empty)
- * @param string  $object_type the type of the object to apply the hook to (can be empty)
- * @param array $modules an array of module names (can be empty)
- * @param array $modules an array of values keyed by keyed by parameter names to pass to the hook function (can be empty)
- * @return array an array of results keyed by module name
- */
-
-function action($hook,$object_id=0, $object_type='', $modules = NULL, $parameters = NULL ) {
-    global $CFG;
-
-    $results = array();
-    if (!$modules) {
-        //if (!$CFG->plugins) {
-            $CFG->plugins = get_list_of_plugins('mod');
-        //}
-        $modules = $CFG->plugins;
-    }
-    foreach ($modules as $mod) {
-        $mod_function = $mod . '_'.$hook;
-        if (function_exists($mod_function)) {
-           if ($parameters) {
-                $results[$mod] = $mod_function($object_id,$object_type,$parameters);
-            } else {
-                $results[$mod] = $mod_function($object_id,$object_type);
-            }
-        }
-    }
-    
-    return $results;
-}
-
-
-/**

devel/profile/edit.php

@@ -54 +54 @@
-    $body = $profile->display_form();
-}   
-$body = templates_draw(array( 'context' => 'contentholder',
-                              'title' => $title,
-                              'body' => $body   ));
-
-
-
-
+
-
-function profile_update($profile_new) {

devel/profile/index.php

@@ -309 +309 @@
-$view  = $profile->view();
-
-
-
-
-
-
-
-
-
+
-
-?>