Changeset 468 for trunk/bin/module_maker/skel/admin.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)
• bin/module_maker/skel/admin.php (modified) (11 diffs)

trunk/bin/module_maker/skel/admin.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/>.
@@ -236 +236 @@
     $db =& DB::getInstance();
     $app =& App::getInstance();
-    
+
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -278 +278 @@
     $db =& DB::getInstance();
     $app =& App::getInstance();
-    
+
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -314 +314 @@
     $db =& DB::getInstance();
     $app =& App::getInstance();
-    
+
     // Remove any stale cached list data.
     $cache->delete('list');
@@ -337 +337 @@
     $db =& DB::getInstance();
     $app =& App::getInstance();
-    
+
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%']);
     if ($lock->isLocked() && !$lock->isMine()) {
@@ -364 +364 @@
     global $tmp_prefs;
     global $cache;
-    $db =& DB::getInstance();   
-    $app =& App::getInstance();
-    
+    $db =& DB::getInstance();
+    $app =& App::getInstance();
+
     $where_clause = '';
 
@@ -379 +379 @@
     if (getFormData('filter___///__', false)) {
         // Limit by filter.
-        $where_clause .= (empty($where_clause) ? 'WHERE' : 'AND') . " __///__ = '" . $db->escapeString(getFormData('filter___///__')) . "'";
+        $where_clause .= (empty($where_clause) ? 'WHERE' : ' AND') . " __///__ = '" . $db->escapeString(getFormData('filter___///__')) . "'";
     }
 
@@ -425 +425 @@
         return $list;
     }
-    
+
     // The list was not cached, so issue the real query.
     $qid = $db->query($sql);
@@ -445 +445 @@
     $db =& DB::getInstance();
     $app =& App::getInstance();
-    
+
     if (!is_array($ranks)) {
         $app->logMsg('Saving rank failed, data posted is not an array: ' . $ranks, LOG_ERR, __FILE__, __LINE__);
@@ -476 +476 @@
     }
 }
-
-?>