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

Timestamp:

Nov 17, 2005 3:00:00 AM (19 years ago)

Author:

scdev

Message:

Tons of little updates and bugfixes. CSS updates to templates and core css files. File upload ability to module_maker. Remade Upload interface to use setParam/getParam.

File:

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

trunk/lib/App.inc.php

@@ -29 +29 @@
     // Instance of database object.
     var $db;
+    
+    // Array of query arguments will be carried persistently between requests.
+    var $_carry_queries = array();
 
     // Hash of global application parameters.
@@ -47 +50 @@
         'ssl_enabled' => false,
     
-        // Character set for page output. Set in the Content-Type header and an HTML <meta content-type> tag.
+        // Character set for page output. Used in the Content-Type header and the HTML <meta content-type> tag.
         'character_set' => 'utf-8',
 
@@ -534 +537 @@
     
     /**
+     * Sets which query arguments will be carried persistently between requests.
+     * Values in the _carry_queries array will be copied to URLs (via oHREF()) and 
+     * to hidden input values (via printHiddenSession()).
+     *
+     * @access  public
+     * @param   string  $query_key  The key of the query argument to save.  
+     * @author  Quinn Comendant <quinn@strangecode.com>
+     * @since   14 Nov 2005 19:24:52
+     */
+    function carryQuery($query_key)
+    {
+        if (!isset($this) || !is_a($this, 'App')) {
+            $this =& App::getInstance();
+        }
+        
+        // If not already set, and there is a non-empty value provided in the request...
+        if (!isset($this->_carry_queries[$query_key]) && getFormData($query_key, false)) {
+            // Copy the value of the specified query argument into the _carry_queries array.
+            $this->_carry_queries[$query_key] = getFormData($query_key);
+        }
+    }
+    
+    /**
      * 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
      * used, the session id will be propogated in the URL.
-     *
-     * @global string $carry_queries       An array of keys to define which values to
-     *                                     carry through from the POST or GET.
-     *                                     $carry_queries = array('qry'); for example.
      *
      * @param  string $url                 The initial url
@@ -565 +587 @@
             return false;
         }
-        
-        static $_using_trans_sid;
-        global $carry_queries;
-    
-        // Save the trans_sid setting.
-        if (!isset($_using_trans_sid)) {
-            $_using_trans_sid = ini_get('session.use_trans_sid');
-        }
-    
-        // Initialize the carried queries.
-        if (!isset($carry_queries['_carry_queries_init'])) {
-            if (!is_array($carry_queries)) {
-                $carry_queries = array($carry_queries);
-            }
-            $tmp = $carry_queries;
-            $carry_queries = array();
-            foreach ($tmp as $key) {
-                if (!empty($key) && getFormData($key, false)) {
-                    $carry_queries[$key] = getFormData($key);
-                }
-            }
-            $carry_queries['_carry_queries_init'] = true;
-        }
-    
-        // Get any additional query arguments to add to the $carry_queries array.
-        // If FALSE is a function argument, DO NOT carry the queries.
+    
+        // Get any provided query arguments to include in the final URL.
+        // If FALSE is a provided here, DO NOT carry the queries.
         $do_carry_queries = true;
         $one_time_carry_queries = array();
@@ -611 +610 @@
             }
         }
-    
+        
         // Get the first delimiter that is needed in the url.
         $delim = preg_match('/\?/', $url) ? ini_get('arg_separator.output') : '?';
@@ -617 +616 @@
         $q = '';
         if ($do_carry_queries) {
-            // Join the perm and temp carry_queries and filter out the _carry_queries_init element for the final query args.
-            $query_args = array_diff_assoc(urlEncodeArray(array_merge($carry_queries, $one_time_carry_queries)), array('_carry_queries_init' => true));
+            // Join the global _carry_queries and local one_time_carry_queries.
+            $query_args = urlEncodeArray(array_merge($this->_carry_queries, $one_time_carry_queries));
             foreach ($query_args as $key=>$val) {
                 // Check value is set and value does not already exist in the url.
@@ -648 +647 @@
                     && 
                     (
-                        !$_using_trans_sid
+                        !ini_get('session.use_trans_sid')
                         || preg_match('!^(http|https)://!i', $url)
                     )
@@ -668 +667 @@
      * as hidden form elements for GET_VARS that might be in use. 
      *
-     * @global string $carry_queries     An array of keys to define which values to
-     *                                   carry through from the POST or GET.
-     *                                   $carry_queries = array('qry'); for example
-     *
      * @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:
@@ -679 +674 @@
      */
     function printHiddenSession($carry_args=null)
-    {
+    {    
         if (!isset($this) || !is_a($this, 'App')) {
             $this =& App::getInstance();
@@ -687 +682 @@
             return false;
         }
-        
-        static $_using_trans_sid;
-        global $carry_queries;
-    
-        // Save the trans_sid setting.
-        if (!isset($_using_trans_sid)) {
-            $_using_trans_sid = ini_get('session.use_trans_sid');
-        }
-        
-        // Initialize the carried queries.
-        if (!isset($carry_queries['_carry_queries_init'])) {
-            if (!is_array($carry_queries)) {
-                $carry_queries = array($carry_queries);
-            }
-            $tmp = $carry_queries;
-            $carry_queries = array();
-            foreach ($tmp as $key) {
-                if (!empty($key) && getFormData($key, false)) {
-                    $carry_queries[$key] = getFormData($key);
-                }
-            }
-            $carry_queries['_carry_queries_init'] = true;
-        }
-    
-        // Get any additional query names to add to the $carry_queries array 
-        // that are found as function arguments.
-        // If FALSE is a function argument, DO NOT carry the queries.
+    
+        // Get any provided query arguments to include in the final hidden form data.
+        // If FALSE is a provided here, DO NOT carry the queries.
         $do_carry_queries = true;
         $one_time_carry_queries = array();
@@ -737 +708 @@
         // For each existing POST value, we create a hidden input to carry it through a form.
         if ($do_carry_queries) {
-            // Join the perm and temp carry_queries and filter out the _carry_queries_init element for the final query args.
-            $query_args = array_diff_assoc(urlEncodeArray(array_merge($carry_queries, $one_time_carry_queries)), array('_carry_queries_init' => true));
+            // Join the global _carry_queries and local one_time_carry_queries.
+            // urlencode is not used here, not for form data!
+            $query_args = array_merge($this->_carry_queries, $one_time_carry_queries);
             foreach ($query_args as $key=>$val) {
                 echo '<input type="hidden" name="' . $key . '" value="' . $val . '" />';
@@ -745 +717 @@
         
         // Include the SID if cookies are disabled.
-        if (!isset($_COOKIE[session_name()]) && !$_using_trans_sid) {
+        if (!isset($_COOKIE[session_name()]) && !ini_get('session.use_trans_sid')) {
             echo '<input type="hidden" name="' . session_name() . '" value="' . session_id() . '" />';
         }