Changeset 320

Timestamp:

Mar 21, 2008 10:20:11 AM (16 years ago)

Author:

quinn

Message:

Added a glob function to the ImageThumb? deleteThumbs method. Fixed some HTML errors. Minor admin2 CSS tweaks.

Location:

trunk

Files:

• bin/module_maker/list_template.cli.php (modified) (1 diff)
• bin/module_maker/skel/adm_list.ihtml (modified) (1 diff)
• css/admin2.inc.css (modified) (4 diffs)
• lib/ImageThumb.inc.php (modified) (5 diffs)
• lib/Utilities.inc.php (modified) (1 diff)
• services/templates/admin_list.ihtml (modified) (1 diff)
• services/templates/log_list.ihtml (modified) (1 diff)

trunk/bin/module_maker/list_template.cli.php

@@ -182 +182 @@
 
 echo isset($op) ? '' : <<<E_O_F
-        <td class="sc-nowrap" align="right"><a title="<\x3fphp printf(_("Delete %s"), oTxt(\$list[\$i]['__///__'])) \x3f>" href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . "?op=del&$primary_key=" . \$list[\$i]['$primary_key']); \x3f>" onclick"javascript:return confirm('<\x3fphp printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt(\$list[\$i]['__///__'])) \x3f>');"><img src="/admin/i/trash.gif" alt="Delete" width="10" height="10" border="0" /></a> &nbsp;</td>
+        <td class="sc-nowrap" align="right"><a title="<\x3fphp printf(_("Delete %s"), oTxt(\$list[\$i]['__///__'])) \x3f>" href="<\x3fphp echo \$app->oHREF(\$_SERVER['PHP_SELF'] . "?op=del&$primary_key=" . \$list[\$i]['$primary_key']); \x3f>" onclick="javascript:return confirm('<\x3fphp printf(_("Are you sure you want to delete the record %s? This action is permanent and cannot be undone."), oTxt(\$list[\$i]['__///__'])) \x3f>');"><img src="/admin/i/trash.gif" alt="Delete" width="10" height="10" border="0" /></a> &nbsp;</td>
     </tr>
     <\x3fphp } \x3f>

trunk/bin/module_maker/skel/adm_list.ihtml

@@ -29 +29 @@
         <td class="sc-padleft sc-nowrap"><a title="<?php printf(_("Versions of %s"), oTxt($list[$i]['__///__'])) ?>" 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/i/multiple.png" alt="" width="12" height="12" border="0" /></a> &nbsp;</td>
 %ADM_LIST_ROWS%
-        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['__///__'])) ?>" 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]['__///__'])) ?>');"><img src="/admin/i/trash.gif" alt="Delete" width="10" height="10" border="0" /></a> &nbsp;</td>
+        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['__///__'])) ?>" 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]['__///__'])) ?>');"><img src="/admin/i/trash.gif" alt="Delete" width="10" height="10" border="0" /></a> &nbsp;</td>
     </tr>
     <?php } ?>

trunk/css/admin2.inc.css

@@ -126 +126 @@
 
 #leftnav a.addlink {
-    margin-left: 0.5em;
+    margin-left: 0.25em;
     font-weight: normal;
 }
@@ -288 +288 @@
 
 .sc-form-row {
-    margin: .35em 0;
+    margin: .5em 0;
 }
 .sc-form-row:after { content: " "; display: block; visibility: hidden; clear: both; height: 0.1px; font-size: 0.1em; line-height: 0; } /* clear floats - Ydnar Hack */
@@ -329 +329 @@
 .sc-form-row label {
     font-size: 70%;
-    padding-top: 0.5em;
+    padding-top: 0.25em;
 }
 
@@ -352 +352 @@
 input[type="button"] {
     margin-right: 5px;
+    padding: 0.4em 0.6em;
     border: 1px solid #ccc;
+    background-color: #eee;
 }
 
 .sc-submit-buttons {
-    margin-top: 20px;
+    margin: 20px 0 20px 130px;
 }
 .sc-form-row .sc-help {

trunk/lib/ImageThumb.inc.php

@@ -638 +638 @@
      *
      * @access  public
-     * @param   string $file_name The file name to delete, with extension.
+     * @param   string  $file_name  The file name to delete, with extension.
+     * @param   bool    $use_glob   Set true to use glob to find the filename (using $file_name as a pattern)
      * @return  bool true on success, false on failure.
      */
-    function deleteThumbs($file_name)
+    function deleteThumbs($file_name, $use_glob=false)
     {
         $app =& App::getInstance();
@@ -653 +654 @@
         $return_val = 0;
         foreach ($this->_image_specs as $spec) {
-            if ('/' == $spec['dest_dir']{0}) {
-                // Absolute path.
-                $dest_file = realpath(sprintf('%s/%s.%s', $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));                
+            // Get base directory depending on if the spec's dest_dir is an absolute path or not.
+            $dest_dir = '/' == $spec['dest_dir']{0} ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
+            if ($use_glob) {
+                $dest_file = realpath(sprintf('%s/%s', $dest_dir, $this->_glob($file_name, $dest_dir)));                
             } else {
-                // Relative path.
-                $dest_file = realpath(sprintf('%s/%s/%s.%s', $this->getParam('source_dir'), $spec['dest_dir'], mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));
-            }
+                $dest_file = realpath(sprintf('%s/%s.%s', $dest_dir, mb_substr($file_name, 0, mb_strrpos($file_name, '.')), $spec['dest_file_extension']));
+            }            
+            
             if (file_exists($dest_file)) {
                 if (!unlink($dest_file)) {
@@ -667 +669 @@
             }
         }
-        $app->logMsg(sprintf('Thumbnails deleted for file: %s', $file_name), LOG_INFO, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Thumbnails deleted for file: %s', $dest_file), LOG_DEBUG, __FILE__, __LINE__);
         return 0 === $return_val;
     }
@@ -766 +768 @@
                     $dest_dir = dirname($filename);
                 } else {
-                    if ('/' == $spec['dest_dir']{0}) {
-                        // Absolute path.
-                        $dest_dir = $spec['dest_dir'];
-                    } else {
-                        // Relative path.
-                        $dest_dir = sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
-                    }
+                    // Get base directory depending on if the spec's dest_dir is an absolute path or not.
+                    $dest_dir = '/' == $spec['dest_dir']{0} ? $spec['dest_dir'] : sprintf('%s/%s', $this->getParam('source_dir'), $spec['dest_dir']);
                 }
                 if (!file_exists($dest_dir)) {
@@ -835 +832 @@
         }
     }
+    
+    /**
+     * Get filename by glob pattern. Searches a directory for an image that matches the
+     * specified glob pattern and returns the filename of the first file found.
+     *
+     * @access  public
+     * @param   string  $pattern    Pattern to match filename.
+     * @param   string  $directory  Pattern to match containing directory.
+     * @return  string filename on success, empty string on failure.
+     * @author  Quinn Comendant <quinn@strangecode.com>
+     * @since   15 Nov 2005 20:55:22
+     */
+    function _glob($pattern, $directory)
+    {
+        $file_list = glob(sprintf('%s/%s', $directory, $pattern));
+        if (isset($file_list[0])) {
+            return basename($file_list[0]);
+        } else {
+            return '';
+        }
+    }
 
 } // End of class.

trunk/lib/Utilities.inc.php

@@ -108 +108 @@
 /**
  * Returns text with stylistic modifications. Warning: this will break some HTML attibutes!
- * TODO: Allow a string such as this to be passted: <a href="javascript:openPopup('/foo/bar.php')">Click here</a>
+ * TODO: Allow a string such as this to be passed: <a href="javascript:openPopup('/foo/bar.php')">Click here</a>
  *
  * @param  string   $text Text to clean.

trunk/services/templates/admin_list.ihtml

@@ -50 +50 @@
         <td class="sc-nowrap"><?php echo oTxt($list[$i]['added_admin_username'], true); ?> &nbsp;</td>
         <td class="sc-nowrap"><?php echo '0000-00-00 00:00:00' == $list[$i]['modified_datetime'] ? '' : date($app->getParam('date_format'), strtotime($list[$i]['modified_datetime'])); ?> &nbsp;</td>
-        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['username'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . "?op=del&admin_id=" . $list[$i]['admin_id']); ?>" 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]['username'])) ?>')"><img src="/admin/i/trash.gif" alt="Delete" width="10" height="10" border="0" /></a> &nbsp;</td>
+        <td class="sc-padleft sc-nowrap" align="right"><a title="<?php printf(_("Delete %s"), oTxt($list[$i]['username'])) ?>" href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . "?op=del&admin_id=" . $list[$i]['admin_id']); ?>" 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]['username'])) ?>')"><img src="/admin/i/trash.gif" alt="Delete" width="10" height="10" border="0" /></a> &nbsp;</td>
     </tr>
     <?php } ?>

trunk/services/templates/log_list.ihtml

@@ -21 +21 @@
                 <?php if (!preg_match($no_download_files, $l['filename'])) { ?><a class="sc-padright" href="<?php echo $app->oHREF('/admin/logs.php?op=download&log=' . $l['filename']); ?>"><?php echo _("Download"); ?></a><?php } ?>
                 <?php if (!preg_match($no_archive_files, $l['filename'])) { ?><a class="sc-padright" href="<?php echo $app->oHREF('/admin/logs.php?op=archive&log=' . $l['filename']); ?>"><?php echo _("Archive"); ?></a><?php } ?>
-                <?php if (!preg_match($no_clear_files, $l['filename'])) { ?><a class="sc-padright" href="<?php echo $app->oHREF('/admin/logs.php?op=clear&log=' . $l['filename']); ?>" onclick"javascript:return confirm('<?php printf(_("Are you sure you want to clear the log file %s? This will empty this file of its contents. This action is not reversible."), $l['filename'])?>')"><?php echo _("Clear"); ?></a><?php } ?>
-                <?php if (!preg_match($no_delete_files, $l['filename'])) { ?><a href="<?php echo $app->oHREF('/admin/logs.php?op=delete&log=' . $l['filename']); ?>" onclick"javascript:return confirm('<?php printf(_("Are you sure you want to delete the log file %s? This will remove this log file permanently. This action is not reversible."), $l['filename'])?>')"><?php echo _("Delete"); ?></a><?php } ?>
+                <?php if (!preg_match($no_clear_files, $l['filename'])) { ?><a class="sc-padright" href="<?php echo $app->oHREF('/admin/logs.php?op=clear&log=' . $l['filename']); ?>" onclick="javascript:return confirm('<?php printf(_("Are you sure you want to clear the log file %s? This will empty this file of its contents. This action is not reversible."), $l['filename'])?>')"><?php echo _("Clear"); ?></a><?php } ?>
+                <?php if (!preg_match($no_delete_files, $l['filename'])) { ?><a href="<?php echo $app->oHREF('/admin/logs.php?op=delete&log=' . $l['filename']); ?>" onclick="javascript:return confirm('<?php printf(_("Are you sure you want to delete the log file %s? This will remove this log file permanently. This action is not reversible."), $l['filename'])?>')"><?php echo _("Delete"); ?></a><?php } ?>
             </td>
         </tr><?php