Changeset 19 for trunk/bin

Timestamp:

Nov 14, 2005 6:22:44 AM (19 years ago)

Author:

scdev

Message:

Rebuilt the services/admins.php script and templates. Fixes since v2 conversion. Lots of bugs and more to come!

Location:

trunk/bin/module_maker

Files:

• _config.inc.php (modified) (1 diff)
• form_template.cli.php (modified) (1 diff)
• list_template.cli.php (modified) (2 diffs)
• skel/adm_form.ihtml (modified) (1 diff)
• skel/adm_list.ihtml (modified) (1 diff)
• skel/admin.php (modified) (4 diffs)
• sql.cli.php (modified) (4 diffs)
• validation.cli.php (modified) (1 diff)

trunk/bin/module_maker/_config.inc.php

@@ -6 +6 @@
 $common_base = realpath($_SERVER['argv'][1]);
 
-
-if (2 == $_SERVER['argc'] && '' != $common_base && is_dir($common_base)) {
+// Test argument.
+if ($_SERVER['argc'] > 1 && '' != $common_base && is_dir($common_base)) {
     // First arg is path to current site. Realpath removes trailing /s
     define('COMMON_BASE', $common_base);
 } else {
-    die("Error: Single argument must be the directory path to an existing site (ex: /home/sc/www.strangecode.com).\n");
+    die("Error: First argument must be the directory path to an existing site (ex: /home/sc/www.strangecode.com).\n");
+}
+
+// Make sure necessary files exist.
+if (!file_exists(COMMON_BASE . '/global/db_auth.inc.php')) {
+    die("Error: First argument directory must contain the global/db_auth.inc.php file with valid MySQL credentials.\n");
 }
 

trunk/bin/module_maker/form_template.cli.php

@@ -33 +33 @@
 }
 
-$exclude = array('added_by_admin_id', 'added_datetime', 'hit_count', 'modified_datetime', 'modified_by_admin_id');
+$exclude = array('added_by_user_id', 'added_datetime', 'hit_count', 'modified_datetime', 'modified_by_user_id');
 $primary_key_field = '';
 $output = array();

trunk/bin/module_maker/list_template.cli.php

@@ -87 +87 @@
         } else if (preg_match('/(amount|_rate)/i', $field)) {
             $listrows[] = "<\x3fphp printf('$%01.2f', \$list[\$i]['$field']); \x3f>";
-        } else if (preg_match('/(added_by_admin_id)/i', $field)) {
+        } else if (preg_match('/(added_by_user_id)/i', $field)) {
             $listrows[] = "<\x3fphp echo oTxt(\$list[\$i]['added_admin_username']); \x3f>";
-        } else if (preg_match('/(modified_by_admin_id)/i', $field)) {
+        } else if (preg_match('/(modified_by_user_id)/i', $field)) {
             $listrows[] = "<\x3fphp echo oTxt(\$list[\$i]['modified_admin_username']); \x3f>";
         } else if ('rank' == $field) {
@@ -146 +146 @@
     <tr>
         <td class="nowrap"><a title="<\x3fphp printf(_("Edit %s"), oTxt(\$list[\$i]['______RECORD_NAME______'])) \x3f>" href="<\x3fphp echo App::oHREF(\$_SERVER['PHP_SELF'] . '?op=edit&$primary_key=' . \$list[\$i]['$primary_key']); \x3f>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0"></a> &nbsp;</td>
-        <td class="nowrap"><a title="<\x3fphp printf(_("Versions of %s"), oTxt(\$list[\$i]['______RECORD_NAME______'])) \x3f>" href="<\x3fphp echo App::oHREF("/admin/record_versions.php?record_table=$db_tbl&record_key=$primary_key&boomerang=true&record_val=" . \$list[\$i]['$primary_key']); \x3f>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
+        <td class="nowrap"><a title="<\x3fphp printf(_("Versions of %s"), oTxt(\$list[\$i]['______RECORD_NAME______'])) \x3f>" href="<\x3fphp echo App::oHREF("/admin/versions.php?record_table=$db_tbl&record_key=$primary_key&boomerang=true&record_val=" . \$list[\$i]['$primary_key']); \x3f>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
 
 E_O_F;

trunk/bin/module_maker/skel/adm_form.ihtml

@@ -9 +9 @@
     <tr>
         <td>&nbsp;</td>
-        <td valign="top">
-        <?php if (!empty($frm['submit_caption'])) { ?><input type="submit" name="submit" value="<?php echo oTxt($frm['submit_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['repeat_caption'])) { ?><input type="submit" name="repeat" value="<?php echo oTxt($frm['repeat_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['reset_caption'])) { ?><input type="submit" name="reset" value="<?php echo oTxt($frm['reset_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['cancel_caption'])) { ?><input type="submit" name="cancel" value="<?php echo oTxt($frm['cancel_caption']); ?>" /><?php } ?>
-        </td>
+        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
 %ADM_FORM_TABLE_ROWS%
     <tr>
         <td>&nbsp;</td>
-        <td valign="top">
-        <?php if (!empty($frm['submit_caption'])) { ?><input type="submit" name="submit" value="<?php echo oTxt($frm['submit_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['repeat_caption'])) { ?><input type="submit" name="repeat" value="<?php echo oTxt($frm['repeat_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['reset_caption'])) { ?><input type="submit" name="reset" value="<?php echo oTxt($frm['reset_caption']); ?>" /><?php } ?>
-        <?php if (!empty($frm['cancel_caption'])) { ?><input type="submit" name="cancel" value="<?php echo oTxt($frm['cancel_caption']); ?>" /><?php } ?>
-        </td>
+        <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     </tr>
 </table>

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -27 +27 @@
     <tr>
         <td class="padleft nowrap"><a title="<?php printf(_("Edit %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/edit.gif" alt="Edit" width="14" height="18" border="0"></a> &nbsp;</td>
-        <td class="padleft nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF('/admin/record_versions.php?record_table=%DB_TBL%&record_key=%PRIMARY_KEY%&boomerang=true&record_val=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
+        <td class="padleft nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF('/admin/versions.php?record_table=%DB_TBL%&record_key=%PRIMARY_KEY%&boomerang=true&record_val=' . $list[$i]['%PRIMARY_KEY%']); ?>"><img src="/admin/_widgets/subcategory.gif" alt="" width="18" height="14" border="0" /></a> &nbsp;</td>
 %ADM_LIST_ROWS%
         <td class="padleft nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['______RECORD_NAME______'])) ?>" href="<?php echo App::oHREF($_SERVER['PHP_SELF'] . "?op=del&%PRIMARY_KEY%=" . $list[$i]['%PRIMARY_KEY%']); ?>" onClick="javascript:return confirm('<?php printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt($list[$i]['______RECORD_NAME______'])) ?>')"><img src="/admin/_widgets/delete.gif" alt="Delete" width="16" height="17" border="0"></a> &nbsp;</td>

trunk/bin/module_maker/skel/admin.php

@@ -217 +217 @@
 
     // Lock this record.
-    $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['address']);
+    $lock->set('%DB_TBL%', '%PRIMARY_KEY%', $id, $frm['<##>']);
     
     // Set misc values for the form.
@@ -277 +277 @@
 
     // Create version.
-    $version = new RecordVersion();
+    $version = new RecordVersion($GLOBALS['auth']);
     $version->create('%DB_TBL%', '%PRIMARY_KEY%', $last_insert_id, $frm['<##>']);
     
@@ -300 +300 @@
         
         // Create version.
-        $version = new RecordVersion();
+        $version = new RecordVersion($GLOBALS['auth']);
         $version->create('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%'], $frm['<##>']);
     
@@ -349 +349 @@
             a2.username AS modified_admin_username
         FROM %DB_TBL%
-        LEFT JOIN admin_tbl a1 ON (%DB_TBL%.added_by_admin_id = a1.admin_id)
-        LEFT JOIN admin_tbl a2 ON (%DB_TBL%.modified_by_admin_id = a2.admin_id)
+        LEFT JOIN admin_tbl a1 ON (%DB_TBL%.added_by_user_id = a1.admin_id)
+        LEFT JOIN admin_tbl a2 ON (%DB_TBL%.modified_by_user_id = a2.admin_id)
         $where_clause
         " . $so->getSortOrderSQL() . "

trunk/bin/module_maker/sql.cli.php

@@ -73 +73 @@
             // Toggle types.
             $c[$field] = "'\" . isset(\$frm['$field']) . \"'";
-        } else if ('added_by_admin_id' == $field || 'modified_by_admin_id' == $field) {
+        } else if ('added_by_user_id' == $field || 'modified_by_user_id' == $field) {
             // Toggle types.
             $c[$field] = "'\" . addslashes(\$auth->getVal('user_id')) . \"'";
@@ -94 +94 @@
 // Insert SQL.
 if (!isset($op) || 'insert' == $op) {
-$insert_skip_columns = array('modified_datetime', 'modified_by_admin_id');
+$insert_skip_columns = array('modified_datetime', 'modified_by_user_id');
 $insert_c = array();
 foreach ($c as $k=>$v) {
@@ -120 +120 @@
 // Update SQL.
 if (!isset($op) || 'update' == $op) {
-$update_skip_columns = array('added_datetime', 'added_by_admin_id');
+$update_skip_columns = array('added_datetime', 'added_by_user_id');
 $comma = '';
 $key_eq_val = '';
@@ -181 +181 @@
 // Search SQL
 if (!isset($op) || 'search' == $op) {
-$search_skip_columns = array('added_datetime', 'added_by_admin_id', 'modified_datetime', 'modified_by_admin_id', 'publish', 'featured');
+$search_skip_columns = array('added_datetime', 'added_by_user_id', 'modified_datetime', 'modified_by_user_id', 'publish', 'featured');
 $search_columns = $db_tbl . '.' . join(" LIKE '%\" . addslashes(\$qry_words[\$i]) . \"%'\n                    OR $db_tbl.", array_diff(array_keys($c), $search_skip_columns));
 echo <<<E_O_F

trunk/bin/module_maker/validation.cli.php

@@ -34 +34 @@
 
 // Exclude these fields.
-$exclude = array('added_by_admin_id', 'added_datetime', 'hit_count', 'modified_datetime', 'modified_by_admin_id');
+$exclude = array('added_by_user_id', 'added_datetime', 'hit_count', 'modified_datetime', 'modified_by_user_id');
 
 // Loop through columns