Changeset 32 for trunk/lib/App.inc.php

Timestamp:

Dec 11, 2005 7:33:45 PM (18 years ago)

Author:

scdev

Message:

 

File:

• trunk/lib/App.inc.php (modified) (9 diffs)

trunk/lib/App.inc.php

@@ -81 +81 @@
         
         // For classes that require db tables, do we check that a table exists and create if missing?
-        'db_create_tables' => null,
+        'db_create_tables' => true,
 
         // The level of error reporting. Don't set this to 0 to suppress messages, instead use display_errors to control display.
@@ -366 +366 @@
             $this =& App::getInstance();
         }
-
-        if (!$this->running) {
+        
+        $message = trim($message);
+
+        if (!$this->running || '' == $message) {
             return false;
         }
@@ -543 +545 @@
     /**
      * Sets which query arguments will be carried persistently between requests.
-     * Values in the _carry_queries array will be copied to URLs (via oHREF()) and 
+     * Values in the _carry_queries array will be copied to URLs (via App::url()) and 
      * to hidden input values (via printHiddenSession()).
      *
@@ -566 +568 @@
     /**
      * Outputs a fully qualified URL with a query of all the used (ie: not empty)
-     * keys and values, including optional queries. This allows simple printing of
-     * links without needing to know which queries to add to it. If cookies are not
+     * keys and values, including optional queries. This allows mindless retention 
+     * of query arguments across page requests. If cookies are not
      * used, the session id will be propogated in the URL.
      *
-     * @param  string $url                 The initial url
-     * @param  mixed  $carry_args          Additional url arguments to carry in the query,
-     *                                     or FALSE to prevent carrying queries. Can be any of the following formats:
-     *                                     -array('key1', key2', key3')  <-- to save these keys if in the form data.
-     *                                     -array('key1'=>'value', key2'='value')  <-- to set keys to default values if not present in form data.
-     *                                     -false  <-- To not carry any queries. If URL already has queries those will be retained.
+     * @param  string $url              The initial url
+     * @param  mixed  $carry_args       Additional url arguments to carry in the query,
+     *                                  or FALSE to prevent carrying queries. Can be any of the following formats:
+     *                                      array('key1', key2', key3')  <-- to save these keys if in the form data.
+     *                                      array('key1'=>'value', key2'='value')  <-- to set keys to default values if not present in form data.
+     *                                      false  <-- To not carry any queries. If URL already has queries those will be retained.
      *
      * @param  mixed  $always_include_sid  Always add the session id, even if using_trans_sid = true. This is required when
@@ -583 +585 @@
      * @return string url with attached queries and, if not using cookies, the session id
      */
-    function oHREF($url='', $carry_args=null, $always_include_sid=false)
+    function url($url, $carry_args=null, $always_include_sid=false)
     {
         if (!isset($this) || !is_a($this, 'App')) {
@@ -617 +619 @@
         
         // Get the first delimiter that is needed in the url.
-        $delim = preg_match('/\?/', $url) ? ini_get('arg_separator.output') : '?';
+        $delim = strpos($url, '?') !== false ? ini_get('arg_separator.output') : '?';
+
         
         $q = '';
@@ -667 +670 @@
         }
     }
+
+    /**
+     * Returns a HTML-friendly URL processed with App::url and & replaced with &amp;
+     *
+     * @access  public
+     * @param   string  $url    Input URL to parse.
+     * @return  string          URL with App::url() and htmlentities() applied.
+     * @author  Quinn Comendant <quinn@strangecode.com>
+     * @since   09 Dec 2005 17:58:45
+     */
+    function oHREF($url, $carry_args=null, $always_include_sid=false)
+    {
+        if (!isset($this) || !is_a($this, 'App')) {
+            $this =& App::getInstance();
+        }
+        
+        $url = $this->url($url, $carry_args, $always_include_sid);
+        
+        // Replace any & not followed by an html or unicode entity with it's &amp; equivalent.
+        $url = preg_replace('/&(?![\w\d#]{1,10};)/', '&amp;', $url);
+        
+        return $url;
+    }
     
     /**
@@ -674 +700 @@
      * @param  mixed  $carry_args        Additional url arguments to carry in the query,
      *                                   or FALSE to prevent carrying queries. Can be any of the following formats:
-     *                                   -array('key1', key2', key3')  <-- to save these keys if in the form data.
-     *                                   -array('key1'=>'value', key2'='value')  <-- to set keys to default values if not present in form data.
-     *                                   -false  <-- To not carry any queries. If URL already has queries those will be retained.
+     *                                      array('key1', key2', key3')  <-- to save these keys if in the form data.
+     *                                      array('key1'=>'value', key2'='value')  <-- to set keys to default values if not present in form data.
+     *                                      false  <-- To not carry any queries. If URL already has queries those will be retained.
      */
     function printHiddenSession($carry_args=null)
-    {    
+    {
         if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
@@ -762 +788 @@
         }
 
-        $url = $this->oHREF($url, $carry_args, $always_include_sid);
+        $url = $this->url($url, $carry_args, $always_include_sid);
         
         header(sprintf('Location: %s', $url));