Changeset 2700

Timestamp:

Oct 10, 2008, 3:11:31 PM (16 years ago)

Author:

rvelices

Message:

• replace a preg_match with simple comparison (faster)
• try to get rid of some JS strict warnings in FF (hope it's fixed)
• template.class.php is included from functions.inc.php instead of common,upgrade,install (maybe later I will try to see the perf impact of compacting/compiling functions.inc.php together with the included files from itself)

Location:

trunk

Files:

• include/common.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (3 diffs)
• install.php (modified) (1 diff)
• template-common/scripts.js (modified) (1 diff)
• template/yoga/picture_nav_buttons.tpl (modified) (1 diff)
• upgrade.php (modified) (1 diff)

trunk/include/common.inc.php

@@ -138 +138 @@
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
-include(PHPWG_ROOT_PATH . 'include/template.class.php');
 
 // Database connection

trunk/include/functions.inc.php

@@ -31 +31 @@
 include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/template.class.php');
 
 //----------------------------------------------------------- generic functions
@@ -70 +71 @@
 {
   $boolean = true;
-  if ( preg_match( '/^false$/i', $string ) )
+  if ( 'false' == strtolower($string) )
   {
     $boolean = false;
@@ -87 +88 @@
   if (is_bool($var))
   {
-    if ($var)
-    {
-      return 'true';
-    }
-    else
-    {
-      return 'false';
-    }
+    return $var ? 'true' : 'false';
   }
   else

trunk/install.php

@@ -187 +187 @@
 include(PHPWG_ROOT_PATH . 'admin/include/functions.php');
 include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
-include(PHPWG_ROOT_PATH . 'include/template.class.php');
 
 if (isset($_GET['language']))

trunk/template-common/scripts.js

@@ -80 +80 @@
 }
 
-PwgWS = function(urlRoot)
+function PwgWS(urlRoot)
 {
         this.urlRoot = urlRoot;

trunk/template/yoga/picture_nav_buttons.tpl

@@ -63 +63 @@
   </div>
 
-<script type="text/javascript">
+<script type="text/javascript">// <![CDATA[
 {literal}
 function keyboardNavigation(e)
 {
-  if(!e) var e=window.event;
-  if (e.altKey) return true;
-  var target = e.target || e.srcElement;
-  if (target && target.type) return true; //an input editable element
-  var keyCode=e.keyCode || e.which;
-  var docElem = document.documentElement;
-  switch(keyCode) {
+        if(!e) e=window.event;
+        if (e.altKey) return true;
+        var target = e.target || e.srcElement;
+        if (target && target.type) return true; //an input editable element
+        var keyCode=e.keyCode || e.which;
+        var docElem = document.documentElement;
+        switch(keyCode) {
 {/literal}
 {if isset($next)}
-  case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){ldelim}window.location="{$next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
+        case 63235: case 39: if (e.ctrlKey || docElem.scrollLeft==docElem.scrollWidth-docElem.clientWidth ){ldelim}window.location="{$next.U_IMG}".replace( "&amp;", "&" ); return false; } break;
 {/if}
 {if isset($previous)}
-  case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ldelim}window.location="{$previous.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+        case 63234: case 37: if (e.ctrlKey || docElem.scrollLeft==0){ldelim}window.location="{$previous.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($first)}
-  /*Home*/case 36: if (e.ctrlKey){ldelim}window.location="{$first.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+        /*Home*/case 36: if (e.ctrlKey){ldelim}window.location="{$first.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($last)}
-  /*End*/case 35: if (e.ctrlKey){ldelim}window.location="{$last.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+        /*End*/case 35: if (e.ctrlKey){ldelim}window.location="{$last.U_IMG|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($U_UP) and !isset($slideshow)}
-  /*Up*/case 38: if (e.ctrlKey){ldelim}window.location="{$U_UP|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+        /*Up*/case 38: if (e.ctrlKey){ldelim}window.location="{$U_UP|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 
 {if isset($slideshow.U_START_PLAY)}
-  /*Pause*/case 32: {ldelim}window.location="{$slideshow.U_START_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+        /*Pause*/case 32: {ldelim}window.location="{$slideshow.U_START_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
 {if isset($slideshow.U_STOP_PLAY)}
-  /*Play*/case 32: {ldelim}window.location="{$slideshow.U_STOP_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
+        /*Play*/case 32: {ldelim}window.location="{$slideshow.U_STOP_PLAY|@escape:jasvascript}".replace("&amp;","&"); return false; } break;
 {/if}
-  }
-  return true;
+        }
+        return true;
 }
 document.onkeydown=keyboardNavigation;
-</script>
+// ]]></script>

trunk/upgrade.php

@@ -27 +27 @@
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
-include(PHPWG_ROOT_PATH.'include/template.class.php');
 
 include(PHPWG_ROOT_PATH.'include/mysql.inc.php');