Changeset 21 for trunk/bin

Timestamp:

Nov 17, 2005 7:37:40 AM (19 years ago)

Author:

scdev

Message:

More random updates. Improved self-instantiation pattern in SessionCache? to match that of App. More little tweaks.

Location:

trunk/bin/module_maker

Files:

• skel/adm_list.ihtml (modified) (1 diff)
• skel/admin.php (modified) (3 diffs)
• sql.cli.php (modified) (1 diff)

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -12 +12 @@
         <?php // printSelectForm('<##>_tbl', "CONCAT(<##>_id, '&mdash;', city, '&mdash;', title)", '<##>_id', getFormData('filter_<##>'), array('Any <##>'), 'ORDER BY <##> ASC'); ?>
     </select>
-    <input type="submit" name="list" value="<?php echo _("Search"); ?>" />
+    <input type="submit" value="<?php echo _("Search"); ?>" />
 </div>
 </form>

trunk/bin/module_maker/skel/admin.php

@@ -216 +216 @@
     if (!$frm = mysql_fetch_assoc($qid)) {
         App::logMsg('Could not find record with %PRIMARY_KEY%: ' . $id, LOG_WARNING, __FILE__, __LINE__);
-        App::raiseMsg(sprintf(_("The requested record %s could not be found"), $id), MSG_ERR, __FILE__, __LINE__);
+        App::raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
         App::dieBoomerangURL();
     }
@@ -244 +244 @@
     if ($lock->isLocked() && !$lock->isMine()) {
         $lock->dieErrorPage();
-    } else {
-        // Break the cache because we are changing the list data.
-        SessionCache::breakCache($_SERVER['PHP_SELF']);
-        
-        // Get the information for this object.
-        $qid = DB::query("
-            SELECT <##> 
-            FROM %DB_TBL%
-            WHERE %PRIMARY_KEY% = '" . addslashes($id) . "'
-        ");
-        if (! list($name) = mysql_fetch_row($qid)) {
-            App::logMsg('Could not find record with %PRIMARY_KEY%: ' . $id, LOG_WARNING, __FILE__, __LINE__);
-            App::raiseMsg(sprintf(_("The requested record %s could not be found"), $id), MSG_ERR, __FILE__, __LINE__);
-            App::dieBoomerangURL();
-        }
-        
-        // Delete the record.
-        DB::query("DELETE FROM %DB_TBL% WHERE %PRIMARY_KEY% = '" . addslashes($id) . "'");
-        
-        App::raiseMsg(sprintf(_("The %ITEM_TITLE% <strong>%s</strong> has been deleted."), $name), MSG_SUCCESS, __FILE__, __LINE__);
-
-        // Unlock record.
-        $lock->remove();
-    }
+    }
+
+    // Break the cache because we are changing the list data.
+    SessionCache::breakCache($_SERVER['PHP_SELF']);
+    
+    // Get the information for this object.
+    $qid = DB::query("
+        SELECT <##> 
+        FROM %DB_TBL%
+        WHERE %PRIMARY_KEY% = '" . addslashes($id) . "'
+    ");
+    if (! list($name) = mysql_fetch_row($qid)) {
+        App::logMsg('Could not find record with %PRIMARY_KEY%: ' . $id, LOG_WARNING, __FILE__, __LINE__);
+        App::raiseMsg(sprintf(_("The requested record %s could not be found."), $id), MSG_ERR, __FILE__, __LINE__);
+        App::dieBoomerangURL();
+    }
+    
+    // Delete the record.
+    DB::query("DELETE FROM %DB_TBL% WHERE %PRIMARY_KEY% = '" . addslashes($id) . "'");
+    
+    App::raiseMsg(sprintf(_("The %ITEM_TITLE% <strong>%s</strong> has been deleted."), $name), MSG_SUCCESS, __FILE__, __LINE__);
+
+    // Unlock record.
+    $lock->remove();
 }
 
@@ -297 +297 @@
     if ($lock->isLocked() && !$lock->isMine()) {
         $lock->dieErrorPage();
-    } else {
-        // Break the cache because we are changing the list data.
-        SessionCache::breakCache($_SERVER['PHP_SELF']);
+    }
+
+    // Break the cache because we are changing the list data.
+    SessionCache::breakCache($_SERVER['PHP_SELF']);
 
 %UPDATE%
-        
-        // Create version.
-        $version = RecordVersion::getInstance($GLOBALS['auth']);
-        $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['<##>']);
-    
-        App::raiseMsg(sprintf(_("The %ITEM_TITLE% <strong>%s</strong> has been updated."), $frm['<##>']), MSG_SUCCESS, __FILE__, __LINE__);
-
-        // Unlock record.
-        $lock->remove();
-    }
+    
+    // Create version.
+    $version = RecordVersion::getInstance($GLOBALS['auth']);
+    $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['<##>']);
+
+    App::raiseMsg(sprintf(_("The %ITEM_TITLE% <strong>%s</strong> has been updated."), $frm['<##>']), MSG_SUCCESS, __FILE__, __LINE__);
+
+    // Unlock record.
+    $lock->remove();
 }
 

trunk/bin/module_maker/sql.cli.php

@@ -127 +127 @@
         continue;
     }
-    $key_eq_val .= $comma . "\n                $k = $v";
+    $key_eq_val .= $comma . "\n            $k = $v";
     $comma = ',';
 }
 echo <<<E_O_F
-        // Update record data.
-        DB::query("
-            UPDATE $db_tbl SET$key_eq_val
-            WHERE $primary_key = '" . addslashes(\$frm['$primary_key']) . "'
-        ");
+    // Update record data.
+    DB::query("
+        UPDATE $db_tbl SET$key_eq_val
+        WHERE $primary_key = '" . addslashes(\$frm['$primary_key']) . "'
+    ");
 E_O_F;
 }