Changeset 468 for trunk/lib/TemplateGlue.inc.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/TemplateGlue.inc.php (modified) (8 diffs)

trunk/lib/TemplateGlue.inc.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 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/>.
@@ -24 +24 @@
  * TemplateGlue.inc.php
  */
-
-/**
- * Print URL to download file with BBEdit/Interarchy. "USER" must be a pre-set
- * environment variable. Files must reside within and be relative to env "DOCUMENT_ROOT".
- *
- * @access  public
- * @param   mixed   $file   File path relative to DOCUMENT_ROOT (i.e. '/_templates/index.ihtml').
- * @return  string  <a> with file basename as text.
- */
-function bbftp($file)
-{
-    return sprintf('<a href="bbftp://%s@%s:%s%s" title="%s" style="text-decoration: none; border-bottom: blue 1px dotted;">%s</a>', $_SERVER['USER'], $_SERVER['HTTP_HOST'], $_SERVER['DOCUMENT_ROOT'], $file, $file, basename($file));
-}
 
 /**
@@ -89 +76 @@
     $app =& App::getInstance();
     $db =& DB::getInstance();
-    
+
     $qid = $db->query("SHOW COLUMNS FROM " . $db->escapeString($db_table) . " LIKE '" . $db->escapeString($db_col) . "'",false);
 
@@ -95 +82 @@
     if (preg_match('/^enum|^set/i', $row[1]) && preg_match_all("/'([^']*)'/", $row[1], $enum)) {
         if ($sort) {
-            natsort($enum[1]);            
+            natsort($enum[1]);
         }
         return $enum[1];
@@ -329 +316 @@
 {
     $db =& DB::getInstance();
-    
+
     // Sometimes preselected comes as a comma list.
     if (!is_array($preselected)) {
@@ -373 +360 @@
 {
     $db =& DB::getInstance();
-    
+
     // Sometimes preselected comes as a comma list.
     if (!is_array($preselected)) {
@@ -501 +488 @@
     }
 }
-
-?>