Changeset 393

Timestamp:

Nov 29, 2011 4:02:29 PM (12 years ago)

Author:

anonymous

Message:

Output compression for CSS.inc.php. Above/below print for printErrorMessage

Location:

trunk/lib

Files:

• CSS.inc.php (modified) (10 diffs)
• FormValidator.inc.php (modified) (2 diffs)
• Navigation.inc.php (modified) (1 diff)

trunk/lib/CSS.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2010 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -36 +36 @@
     // CSS object parameters.
     var $_params = array(
-        'cache_css' => true,
         'character_set' => 'utf-8',
+        'cache_css' => false,
+        'strip_whitespace' => false,
+        'output_compression' => false,
     );
 
@@ -49 +51 @@
     {
         $app =& App::getInstance();
-    
+
         if (isset($params) && is_array($params)) {
             // Merge new parameters with old overriding only those passed.
@@ -68 +70 @@
     {
         $app =& App::getInstance();
-    
+
         if (isset($this->_params[$param])) {
             return $this->_params[$param];
@@ -88 +90 @@
     {
         $app =& App::getInstance();
-    
+
         if (!is_array($realms)) {
             $realms = array($realms);
@@ -116 +118 @@
     {
         $app =& App::getInstance();
-    
+
         $realm = '' == $realm ? 'default' : $realm;
 
@@ -132 +134 @@
         $latest_mtime = array_pop($files_mtime);
 
-        if ($this->_params['cache_css']) {
+        if ($this->getParam('output_compression') && extension_loaded('zlib')) {
+            ob_start('ob_gzhandler');
+        }
+
+        if ($this->getParam('cache_css')) {
             header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $latest_mtime) . ' GMT');
             header('Cache-Control: public, max-age=86400');
@@ -140 +146 @@
             header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
         }
-        header('Content-Type: text/css; charset=' . $this->_params['character_set']);
+        header('Content-Type: text/css; charset=' . $this->getParam('character_set'));
     }
 
@@ -160 +166 @@
 
         foreach ($this->_css_files[$realm] as $file) {
-            include $file;
+            if ($this->getParam('strip_whitespace')) {
+                // Strip whitespace and print file.
+                echo preg_replace('/[ \t\n\r]+/', ' ', file_get_contents($file, true));
+            } else {
+                // Include file as is.
+                include $file;
+            }
+        }
+
+        if ($this->getParam('output_compression') && extension_loaded('zlib')) {
+            ob_end_flush();
         }
     }
-
 }
 ?>

trunk/lib/FormValidator.inc.php

@@ -174 +174 @@
      * Prints the HTML for displaying error messages.
      *
+     * @param   string  $above    Additional message to print above error messages (e.g. "Oops!").
+     * @param   string  $below    Additional message to print below error messages (e.g. "Please fix and resubmit").
      * @access  public
      * @author  Quinn Comendant <quinn@strangecode.com>
      * @since   15 Jul 2005 01:39:14
      */
-    function printErrorMessages()
+    function printErrorMessages($above='', $below='')
     {
         $app =& App::getInstance();
         if ($this->anyErrors()) {
             ?><div class="sc-msg" id="sc-msg-formvalidator"><?php
+            if ('' != $above) {
+                ?><div class="sc-above"><?php echo oTxt($above); ?></div><?php
+            }
             foreach ($this->getErrorList() as $e) {
                 if ('' != $e['message'] && is_string($e['message'])) {
@@ -208 +213 @@
                 }
             }
+            if ('' != $below) {
+                ?><div class="sc-below"><?php echo oTxt($below); ?></div><?php
+            }
             ?></div><?php
         }

trunk/lib/Navigation.inc.php

@@ -281 +281 @@
     function currentPage($page_uri, $return=true)
     {
-        // $page_uri = str_replace('/', '\/', $page_uri);
         if (preg_match('/^' . preg_quote(urldecode($page_uri), '/') . '/i', $_SERVER['PHP_SELF'])) {
             return $return;