Changeset 22 for trunk/bin


Ignore:
Timestamp:
Nov 23, 2005 9:29:33 PM (18 years ago)
Author:
scdev
Message:

More bugs and shifting things about.

Location:
trunk/bin/module_maker
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/bin/module_maker/form_template.cli.php

    r21 r22  
    6464    <tr>
    6565        <td class="right"><label for="$field"<\x3fphp \$fv->err('$field', ' class="error"') \x3f>><\x3fphp echo _("$title"); \x3f></label></td>
    66         <td valign="top">
     66        <td>
    6767            <select name="$field" class="small">
    68             <\x3fphp printSelectForm('<##>_tbl', "CONCAT(<##>_id, '&mdash;', <##>)", '$field', \$frm['$field'], true, 'ORDER BY $field DESC'); \x3f>
     68            <\x3fphp printSelectForm('<##>_tbl', "CONCAT(<##>_id, '&mdash;', <##>)", '$field', \$frm['$field'], true, 'ORDER BY $field ASC'); \x3f>
    6969            </select>
     70            <span class="commandtext">
     71                <span class="commanditem"><a href="<\x3fphp echo App::oHREF('<##>.php?op=add&boomerang=true'); \x3f>" onClick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>')"><\x3fphp echo _("Add <##>") \x3f></a></span>
     72                <\x3fphp if ('' != \$frm['<##>_id']) { \x3f>
     73                    <span class="commanditem"><a href="<\x3fphp echo App::oHREF('<##>.php?op=edit&boomerang=true&<##>_id=' . \$frm['<##>_id']); \x3f>" onClick="javascript:return confirm('<\x3fphp echo _("Notice: You are about to leave this form page and any changes you may have made without saving will be lost."); \x3f>')"><\x3fphp echo sprintf(_("Edit <##> <em>%s</em>"), \$frm['<##>']) \x3f></a></span>
     74                <\x3fphp } \x3f>
     75            </span>
    7076        </td>
    7177    </tr>
    … …  
    7985    <tr>
    8086        <td class="right"><label for="$field"<\x3fphp \$fv->err('$field', ' class="error"') \x3f>><\x3fphp echo _("$title"); \x3f></label></td>
    81         <td valign="top">
     87        <td>
    8288            <input type="file" name="$field" />
    8389            <\x3fphp if ('' != \$upload->getFilenameGlob(getFormData('$primary_key_field') . '_*') && getFormData('op') == 'edit' || getFormData('op') == 'update') { \x3f>
    84             <div class="help"><\x3fphp printf(_("The current file <a href=\"%s/%2\$s\"><strong>%2\$s</strong></a> will be deleted if a new file is selected for upload."), '/_db_files/<##>', \$upload->getFilenameGlob(getFormData('$primary_key_field') . '_*')) \x3f></div>
     90            <div class="help"><\x3fphp printf(_("The current file <a href=\"%s/%2\\\$s\"><strong>%2\\\$s</strong></a> will be deleted if a new file is selected for upload."), '/_db_files/<##>', \$upload->getFilenameGlob(getFormData('$primary_key_field') . '_*')) \x3f></div>
    8591            <\x3fphp } \x3f>
    8692            <div class="help"><\x3fphp printf(_("File to upload must have one of the following file-name extensions: %s."), join(', ', \$upload->getParam('valid_file_extensions'))) \x3f></div>
    … …  
    96102    <tr>
    97103        <td class="right"><label for="$field"<\x3fphp \$fv->err('$field', ' class="error"') \x3f>><\x3fphp echo _("$title"); \x3f></label></td>
    98         <td valign="top">
     104        <td>
    99105            <input type="password" class="medium" size="50" name="$field" value="<\x3fphp echo oTxt(\$frm['$field']); \x3f>" />
    100106        </td>
    … …  
    111117    <tr>
    112118        <td class="right"><label for="$field"<\x3fphp \$fv->err('$field', ' class="error"') \x3f>><\x3fphp echo _("$title"); \x3f></label></td>
    113         <td valign="top">
     119        <td>
    114120            <select name="$field">
    115121            <\x3fphp printSetSelectForm('$db_tbl', '$field', \$frm['$field'], true); \x3f>
    … …  
    125131    <tr>
    126132        <td class="right"><label for="$field"<\x3fphp \$fv->err('$field', ' class="error"') \x3f>><\x3fphp echo _("$title"); \x3f></label></td>
    127         <td valign="top">
     133        <td>
    128134            <\x3fphp printSetCheckboxes('$db_tbl', '$field', \$frm['$field'], 1) \x3f>
    129135        </td>
    … …  
    156162    <tr>
    157163        <td class="right"><label for="$field"<\x3fphp \$fv->err('$field', ' class="error"') \x3f>><\x3fphp echo _("$title"); \x3f></label></td>
    158         <td valign="top">
     164        <td>
    159165            <textarea class="large" cols="75" rows="4" name="$field"><\x3fphp echo oTxt(\$frm['$field']); \x3f></textarea>
    160166        </td>
    … …  
    195201    <tr>
    196202        <td class="right"><label for="$field"<\x3fphp \$fv->err('$field', ' class="error"') \x3f>><\x3fphp echo _("$title"); \x3f></label></td>
    197         <td valign="top">
     203        <td>
    198204            <input type="text" class="medium" size="50" name="$field" value="<\x3fphp echo oTxt(\$frm['$field']); \x3f>" />
    199205        </td>

  • trunk/bin/module_maker/module.cli.php

    r21 r22  
    207207$search['admin_upload_insert'] = '/%ADMIN_UPLOAD_INSERT%/';
    208208$replace['admin_upload_insert'] = '';
    209 $search['admin_upload_insert2'] = '/%ADMIN_UPLOAD_INSERT2%/';
    210 $replace['admin_upload_insert2'] = '';
    211209$search['admin_upload_update'] = '/%ADMIN_UPLOAD_UPDATE%/';
    212210$replace['admin_upload_update'] = '';
    213211
    214212if ($upload_file_capability) {
     213    // Form arguments
    215214    $replace['admin_form_tag_init'] = "<form enctype=\"multipart/form-data\" method=\"post\" action=\"<\x3fphp echo \$_SERVER['PHP_SELF']; \x3f>\">\n<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"<##>\" />";
    216 
     215   
     216    // Include statement.
    217217    $replace['admin_upload_include'] = "require_once 'codebase/lib/Upload.inc.php';\n";
    218218
     219    // Config
    219220    $replace['admin_upload_config'] = <<<E_O_F
    220221
    … …  
    230231E_O_F;
    231232
     233    // Main init.
    232234    $replace['admin_upload_init'] = <<<E_O_F
    233235
    … …  
    238240E_O_F;
    239241
     242    // Delete.
    240243    $replace['admin_upload_del'] = <<<E_O_F
    241244
    … …  
    246249E_O_F;
    247250
     251    // Insert 1.
    248252    $replace['admin_upload_insert'] = <<<E_O_F
    249253
    250         // Upload file.
    251         if (!\$new_files = \$upload->process('<##>')) {
    252             // Upload failed. Reload form, displaying errors.
    253             \$frm =& addRecordForm();
    254             \$frm = array_merge(\$frm, getFormData());
    255             \$nav->addPage(_("Add %ITEM_TITLE%"));
    256             \$main_template = '%ADMIN_FORM_TEMPLATE%';
    257             break;
     254        // Upload files with prepended primary key.
     255        \$new_file = \$upload->process('<##>',  \$%PRIMARY_KEY% . '_' . getFormData('<##>'));
     256
     257        // If file upload errors, redirect to edit operation for the inserted record.
     258        if (\$upload->anyErrors() || false === \$new_file) {
     259            App::dieURL(\$_SERVER['PHP_SELF'] . '?op=edit&%PRIMARY_KEY%=' . \$%PRIMARY_KEY%);
    258260        }
    259261E_O_F;
    260262
    261     $replace['admin_upload_insert2'] = <<<E_O_F
    262 
    263         // Record inserted successfuly. Now we know the primary key, prepend to filename.
    264         \$upload->moveFile(\$new_files[0]['name'], \$%PRIMARY_KEY% . '_' . \$new_files[0]['name']);
    265 E_O_F;
    266 
     263    // Update.
    267264    $replace['admin_upload_update'] = <<<E_O_F
    268265
    269         // Upload new file.
     266        // Upload new files.
    270267        if (getFormData('<##>')) {
    271             if (\$upload->process('<##>',  getFormData('%PRIMARY_KEY%') . '_' . getFormData('<##>'))) {
    272                 // Upload success. Delete old file.
    273                 if ('' != \$upload->getFilenameGlob(getFormData('%PRIMARY_KEY%') . '_*')) {
    274                     \$upload->deleteFile(\$upload->getFilenameGlob(getFormData('%PRIMARY_KEY%') . '_*'));
    275                 }
    276             } else {
    277                 // Upload failed. Reload form, displaying errors.
     268            // Get old file names for deletion.
     269            \$old_file = \$upload->getFilenameGlob(getFormData('%PRIMARY_KEY%') . '_*');
     270            // Process new file upload with prepended primary key.
     271            \$new_file = \$upload->process('<##>',  getFormData('%PRIMARY_KEY%') . '_' . getFormData('<##>'));
     272            if (false === \$new_file || \$upload->anyErrors()) {
     273                // Upload failed. Reload form. Display errors.
    278274                \$frm =& editRecordForm(getFormData('%PRIMARY_KEY%'));
    279275                \$frm = array_merge(\$frm, getFormData());
    … …  
    281277                \$main_template = '%ADMIN_FORM_TEMPLATE%';
    282278                break;
    283             }           
     279            } else {
     280                // Upload succeeded. Delete old files.
     281                if ('' != \$old_file && \$old_file != \$new_file[0]['name']) {
     282                    \$upload->deleteFile(\$old_file);
     283                }
     284            }
    284285        }
    285286E_O_F;
    286 } // End if.
     287} // End upload_file_capability.
    287288
    288289

  • trunk/bin/module_maker/skel/adm_form.ihtml

    r21 r22  
    99    <tr>
    1010        <td>&nbsp;</td>
    11         <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     11        <td><?php printSubmitButtons($frm['submit_buttons']); ?></td>
    1212    </tr>
    1313%ADM_FORM_TABLE_ROWS%
    1414    <tr>
    1515        <td>&nbsp;</td>
    16         <td valign="top"><?php printSubmitButtons($frm['submit_buttons']); ?></td>
     16        <td><?php printSubmitButtons($frm['submit_buttons']); ?></td>
    1717    </tr>
    1818</table>

  • trunk/bin/module_maker/skel/admin.php

    r21 r22  
    9292//     $auth->requireAccessClearance(ZONE_ADMIN_%NAME_UPPER%_FUNC_ADD);
    9393    if (getFormdata('cancel', false)) {
     94        if (App::validBoomerangURL('%NAME_PLURAL%')) {
     95            // Display boomerang page.
     96            App::dieBoomerangURL('%NAME_PLURAL%');
     97        }
     98        // Display default page.
    9499        App::dieURL($_SERVER['PHP_SELF']);
    95100    }
    … …  
    100105        $nav->addPage(_("Add %ITEM_TITLE%"));
    101106        $main_template = '%ADMIN_FORM_TEMPLATE%';
    102     } else {%ADMIN_UPLOAD_INSERT%
    103         $%PRIMARY_KEY% = insertRecord(getFormData());%ADMIN_UPLOAD_INSERT2%
     107    } else {
     108        $%PRIMARY_KEY% = insertRecord(getFormData());%ADMIN_UPLOAD_INSERT%
    104109        if (getFormdata('repeat', false)) {
    105110            // Display function again.
    … …  
    122127    if (getFormdata('cancel', false)) {
    123128        // Remove lock
    124         $lock =& RecordLock::getInstance($GLOBALS['auth']);
    125129        $lock->select('%DB_TBL%', '%PRIMARY_KEY%', getFormData('%PRIMARY_KEY%'));
    126130        $lock->remove();
    … …  
    202206function &editRecordForm($id)
    203207{
    204     $lock =& RecordLock::getInstance($GLOBALS['auth']);
     208    global $lock;
     209
    205210    $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
    206211    if ($lock->isLocked() && !$lock->isMine()) {
    … …  
    240245function deleteRecord($id)
    241246{
    242     $lock =& RecordLock::getInstance($GLOBALS['auth']);
     247    global $lock;
     248   
    243249    $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $id);
    244250    if ($lock->isLocked() && !$lock->isMine()) {
    … …  
    291297function updateRecord($frm)
    292298{
    293     global $auth;
    294    
    295     $lock =& RecordLock::getInstance($GLOBALS['auth']);
     299    global $auth, $lock;
     300   
    296301    $lock->select('%DB_TBL%', '%PRIMARY_KEY%', $frm['%PRIMARY_KEY%']);
    297302    if ($lock->isLocked() && !$lock->isMine()) {
Note: See TracChangeset for help on using the changeset viewer.