Changeset 151 for trunk/bin

Timestamp:

Jun 6, 2006 3:19:17 AM (18 years ago)

Author:

scdev

Message:

Q - Changed one more SessionCache? -> Cache, small bug fixt to Prefs, added operation help to modulemaker scripts.

Location:

trunk/bin/module_maker

Files:

• _config.inc.php (modified) (1 diff)
• list_template.cli.php (modified) (1 diff)
• module.cli.php (modified) (1 diff)
• skel/admin.php (modified) (6 diffs)
• sql.cli.php (modified) (1 diff)
• validation.cli.php (modified) (1 diff)

trunk/bin/module_maker/_config.inc.php

@@ -3 +3 @@
  * code by strangecode :: www.strangecode.com :: this document contains copyrighted information. */
 
-// Determine common site directory.
-$common_base = realpath($_SERVER['argv'][1]);
-
 // Test argument.
-if ($_SERVER['argc'] > 1 && '' != $common_base && is_dir($common_base)) {
+if ($_SERVER['argc'] > 1 && isset($_SERVER['argv'][1]) && '' != $_SERVER['argv'][1] && is_dir($_SERVER['argv'][1])) {
+    // Determine common site directory.
+    $common_base = realpath($_SERVER['argv'][1]);
+    
     // First arg is path to current site. Realpath removes trailing /s
     define('COMMON_BASE', $common_base);

trunk/bin/module_maker/list_template.cli.php

@@ -16 +16 @@
     $db_tbl = $_SERVER['argv'][2];
 } else {
-    die(sprintf("Usage: %s site_directory db_table [operation]\n", basename($_SERVER['argv'][0])));
+    die(sprintf("Usage: %s site_directory db_table [operation]\nValid operations include: %s", basename($_SERVER['argv'][0]), join(', ', $valid_ops)));
 }
 

trunk/bin/module_maker/module.cli.php

@@ -18 +18 @@
     die(basename($_SERVER['argv'][0]) . " Error: invalid arguments. Try like this:
 
-    " . basename($_SERVER['argv'][0]) . " site_directory name_singular name_plural [clean]
+    " . basename($_SERVER['argv'][0]) . " site_directory name_singular name_plural [operation]
+    
+Valid operations include: " . join(', ', $valid_ops) . "
 
 The following files will be generated by this script:

trunk/bin/module_maker/skel/admin.php

@@ -33 +33 @@
 $fv = new FormValidator();
 
-$cache =& SessionCache::getInstance();
+$cache =& Cache::getInstance();
 
 %SORT_ORDER%
@@ -250 +250 @@
     global $lock;
     $db =& DB::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
@@ -285 +285 @@
     global $auth;
     $db =& DB::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     // Break the cache because we are changing the list data.
@@ -306 +306 @@
     global $auth, $lock;
     $app =& App::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%']);
@@ -334 +334 @@
     $db =& DB::getInstance();
     $prefs =& Prefs::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     $where_clause = '';
@@ -411 +411 @@
 {
     $db =& DB::getInstance();
-    $cache =& SessionCache::getInstance();
+    $cache =& Cache::getInstance();
     
     if (!is_array($ranks)) {

trunk/bin/module_maker/sql.cli.php

@@ -16 +16 @@
     $db_tbl = $_SERVER['argv'][2];
 } else {
-    die(sprintf("Usage: %s site_directory db_table [operation]\n", basename($_SERVER['argv'][0])));
+    die(sprintf("Usage: %s site_directory db_table [operation]\nValid operations include: %s", basename($_SERVER['argv'][0]), join(', ', $valid_ops)));
 }
 

trunk/bin/module_maker/validation.cli.php

@@ -187 +187 @@
         }
         if ($max_length > 0 && $len_type == 'string') {
-            $o[] = "\$fv->stringLength('$field', 0, $max_length, sprintf(_(\"%s must be %f-to-%f characters in length.\"), _(\"$title\"), 0, $max_length));";
+            $o[] = "\$fv->stringLength('$field', 0, $max_length, sprintf(_(\"%s must be %d-to-%d characters in length.\"), _(\"$title\"), 0, $max_length));";
         }
         if ($len_type == 'num') {
-            $o[] = "\$fv->numericRange('$field', $min, $max, sprintf(_(\"%s must be a number between %f and %f.\"), _(\"$title\"), $min, $max));";
+            $o[] = "\$fv->numericRange('$field', $min, $max, sprintf(_(\"%s must be a number between %d and %d.\"), _(\"$title\"), $min, $max));";
         }