--- path_image.module.cvs	2006-12-15 15:53:20.000000000 +0000
+++ path_image.module	2006-12-19 13:07:35.750059680 +0000
@@ -8,7 +8,7 @@
  *
  * Written by AjK October 2006
  */
- 
+
 /**
  * 26Oct2006 11:31 : AjK
  *  added in the use of file_directory_path() to lock the image
@@ -24,13 +24,13 @@
     // uncomment the following line to enable debugging mode
     // define("PATH_IMAGE_DEBUG", "INLINE");
   }
-  
+
   // define our module name, this MUST be defined here
   define("PATH_IMAGE_MODULE_NAME", "path_image");
-  
+
   // define the block delta
   define("PATH_IMAGE_BLOCK_DELTA_DISPLAY", 0);
-  
+
   _path_image_debug("path_image_init()");
 }
 
@@ -39,7 +39,7 @@
  */
 function path_image_perm() {
   _path_image_debug('path_image_perm()');
-  
+
   return array('Path image admin');
 }
 
@@ -48,12 +48,12 @@
  */
 function path_image_help($section) {
   _path_image_debug("path_image_help('$section')");
-  
+
   switch ($section) {
     case 'admin/modules#description':
       return t('Provides an block containing an image dependent upon the URL path');
   }
-  
+
   return '';
 }
 
@@ -73,7 +73,7 @@
       'type' => MENU_NORMAL_ITEM
     );
   }
-  
+
   return $items;
 }
 
@@ -82,7 +82,7 @@
  */
 function path_image_form_alter($form_id, &$form) {
   _path_image_debug("path_image_form_alter('$form_id')");
-  
+
   if ('block_admin_configure' == $form_id) {
     if (isset($form['module']['#value']) && 'path_image' == $form['module']['#value']) {
       $form['path_image'] = array(
@@ -96,7 +96,7 @@
         '#value' => t('This section allows you to control the block\'s visibility. '.
                       'To administer the block\'s content please visit the block\'s '.
                       l('administration section', 'admin/settings/path_image'))
-      );  
+      );
     }
   }
 }
@@ -109,7 +109,7 @@
 
   switch ($op) {
     case 'list':
-      $blocks[PATH_IMAGE_BLOCK_DELTA_DISPLAY] = array(    
+      $blocks[PATH_IMAGE_BLOCK_DELTA_DISPLAY] = array(
         'info' => t('Path to image display block'),
         'weight' => -10,
         'enabled' => 0,
@@ -117,14 +117,14 @@
       );
       return $blocks;
       break;
-      
+
     case 'view':
       switch ($delta) {
         case PATH_IMAGE_BLOCK_DELTA_DISPLAY:
           return _path_image_block_main();
           break; // not really needed but be consistent
       } // end switch()
-  } // end switch() 
+  } // end switch()
 }
 
 /**
@@ -138,11 +138,11 @@
   // where all debugging messages are normally dumped
   // (I like to do "tail -f error_log" to watch but
   // that's not always possible)
-  
+
   if (!defined("PATH_IMAGE_DEBUG") || PATH_IMAGE_DEBUG != 'INLINE') {
     return;
   }
- 
+
   if (is_array($GLOBALS[PATH_IMAGE_MODULE_NAME]['debug'])) {
     print ("\n<!--\n");
     foreach ($GLOBALS[PATH_IMAGE_MODULE_NAME]['debug'] as $line) {
@@ -155,35 +155,35 @@
 /**
  * End of hooks, helpers follow
  */
- 
+
 function _path_image_block_main() {
   global $base_url;
-  
+
   // Flag whether to fallback to use the default image
   $use_default_image = FALSE;
   $use_homepage_image = FALSE;
-  
+
   // flag to show a match was made
   $match_made = FALSE;
-  
+
   // prepare params array
   $params = array();
-  
+
   // input comes in the form of the query string,
   // explode that into an array and scan the array
   // for the first numeric component... REDIRECT_URL
   // $path_parts = explode('/', drupal_get_path_alias($_GET['q']));
-  
+
   $path = trim($_SERVER['REDIRECT_URL'], '/');
-    
+
   if (!strlen($path) || strpos(drupal_set_header(), '403 Forbidden')) {
       if (variable_get('path_image_homepage_use', 0)) {
         $use_homepage_image = TRUE;
-      }  
+      }
   }
   else {
     $path_parts = explode('/', $path);
-        
+
     if (is_array($path_parts)) {
       foreach($path_parts as $arg) {
         if (is_numeric($arg) && variable_get('path_image_numeric_use', 1)) {
@@ -207,7 +207,7 @@
       }
     }
   }
-  
+
   if ($path_parts) {
     // now build a series of search strings to make SQL statement(s) from
     $last_arg = FALSE;
@@ -216,14 +216,14 @@
       $last_arg .= $arg . '/';
     }
     $search_paths = array_reverse($search_paths); // ensure longest path comes first in search
- 
+
     // now we can search the database for possible matches
     foreach ($search_paths as $path) {
       $sql = 'SELECT image_file, LENGTH(path) AS path_len '.
              'FROM {path_image_data} '.
              'WHERE path LIKE "%s%%" '.
              'ORDER BY path_len ASC';
-    
+
       $r = db_query($sql, $path);
       if (db_num_rows($r)) {
         // we have a match!
@@ -235,10 +235,10 @@
           'file_system_folder' => file_directory_path(),
           'path_match' => $path
         );
-        $params['full_uri'] = 
-          trim($params['base_url'], '/') . '/' . 
+        $params['full_uri'] =
+          trim($params['base_url'], '/') . '/' .
           trim($params['file_system_folder']) . '/' .
-          trim($params['image_repos'], '/') . '/' . 
+          trim($params['image_repos'], '/') . '/' .
           trim($params['image_file'], '/');
         $match_made = TRUE;
         break;
@@ -247,10 +247,10 @@
         if (variable_get('path_image_default_use', 0)) {
           $use_default_image = TRUE;
         }
-      }      
+      }
     }
   }
-  
+
   if (!$match_made && $use_default_image && strlen($path)) {
     $params = array(
       'image_file' => variable_get('path_image_default_image', 'none'),
@@ -267,15 +267,15 @@
       'base_url' => $base_url,
       'file_system_folder' => file_directory_path(),
       'path_match' => $path
-    );  
+    );
   }
 
   if (count($params)) {
-    $params['full_uri'] = 
-      trim($params['base_url'], '/') . '/' . 
+    $params['full_uri'] =
+      trim($params['base_url'], '/') . '/' .
       trim($params['file_system_folder']) . '/' .
-      trim($params['image_repos'], '/') . '/' . 
-      trim($params['image_file'], '/');  
+      trim($params['image_repos'], '/') . '/' .
+      trim($params['image_file'], '/');
     if (_path_image_file_exists($params)) {
       return array(
         'subject' => variable_get('path_image_block_subject', t('Path Image')),
@@ -283,7 +283,7 @@
       );
     }
   }
-  
+
   return array();
 }
 
@@ -291,8 +291,7 @@
  * themeable function for display of the block
  */
 function theme_path_image_block_0($params) {
-
-  return '<img src="' . $params['full_uri'] . '" border="1" />';
+  return '<img src="' . $params['full_uri'] . '" alt="' . $params['image_file'] . '" />';
 }
 
 /**
@@ -301,9 +300,9 @@
 function _path_image_file_exists($params = array()) {
 
   return file_exists(
-    $_SERVER['DOCUMENT_ROOT'] . '/' . 
+    $_SERVER['DOCUMENT_ROOT'] . '/' .
     file_directory_path() . '/' .
-    $params['image_repos'] . '/' . 
+    $params['image_repos'] . '/' .
     $params['image_file']
   );
 }
@@ -317,12 +316,12 @@
  * function does this automatically. Note, this will leave
  * you in good stead as it's one of the upgrade parts that
  * need doing for Drupal 5 anyway.
- */ 
+ */
 function _path_image_settings() {
 
   $form = array();
   $files = _path_image_get_image_files();
-  
+
   $form['path_image']['block_subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Block title'),
@@ -356,47 +355,47 @@
     '#description' => t('When scanning a path this halts the scan at the first '.
                        'numeric found. If you want to scan the entire path then '.
                        'ensure this is off (default is on)')
-  );    
+  );
 
   $form['path_image']['homepage_image'] = array(
     '#type' => 'select',
     '#title' => t('Default image for the homepage'),
     '#default_value' => variable_get('path_image_homepage_image', reset($files)),
     '#options' => $files,
-    '#prefix' => theme('path_image_form_wrapper', 'cell_first_prefix', array('cell' => array('valign' => 'top'))), 
+    '#prefix' => theme('path_image_form_wrapper', 'cell_first_prefix', array('cell' => array('valign' => 'top'))),
   );
   $form['path_image']['homepage_use'] = array(
     '#type' => 'checkbox',
     '#title' => t('Use this image on the homepage'),
     '#default_value' => variable_get('path_image_homepage_use', 0),
-    '#suffix' => theme('path_image_form_wrapper', 'cell_middle_suffix')            
-  );    
+    '#suffix' => theme('path_image_form_wrapper', 'cell_middle_suffix')
+  );
 
   $form['path_image']['mid_markup'] = array(
-    '#type' => 'markup', 
+    '#type' => 'markup',
     '#value' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', // white space between table cells
-    '#prefix' => theme('path_image_form_wrapper', 'cell_middle_prefix', array('cell' => array('valign' => 'top'))), 
-    '#suffix' => theme('path_image_form_wrapper', 'cell_middle_suffix')            
+    '#prefix' => theme('path_image_form_wrapper', 'cell_middle_prefix', array('cell' => array('valign' => 'top'))),
+    '#suffix' => theme('path_image_form_wrapper', 'cell_middle_suffix')
   );
-  
+
   $form['path_image']['default_image'] = array(
     '#type' => 'select',
     '#title' => t('Default image when no match made'),
     '#default_value' => variable_get('path_image_default_image', reset($files)),
     '#options' => $files,
-    '#prefix' => theme('path_image_form_wrapper', 'cell_middle_prefix', array('cell' => array('valign' => 'top'))), 
+    '#prefix' => theme('path_image_form_wrapper', 'cell_middle_prefix', array('cell' => array('valign' => 'top'))),
   );
   $form['path_image']['default_use'] = array(
     '#type' => 'checkbox',
     '#title' => t('Use this image when no match is made'),
     '#default_value' => variable_get('path_image_default_use', 0),
-    '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix')            
-  );    
-  
+    '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix')
+  );
+
   $form['path_image']['new_entry'] = array(
     '#type' => 'fieldset',
     '#title' => t('New path entry'),
-    '#tree' => TRUE,  
+    '#tree' => TRUE,
   );
   $form['path_image']['new_entry']['new_path'] = array(
     '#type' => 'textfield',
@@ -404,8 +403,8 @@
     '#default_value' => '',
     '#size' => 50,
     '#description' => t('Enter a new path. <em>Note, no leading / (slash)</em>'),
-    '#prefix' => theme('path_image_form_wrapper', 'cell_first_prefix', array('table' => array('border' => '0'), 'cell' => array('valign' => 'top'))), 
-    '#suffix' => theme('path_image_form_wrapper', 'cell_first_suffix'), 
+    '#prefix' => theme('path_image_form_wrapper', 'cell_first_prefix', array('table' => array('border' => '0'), 'cell' => array('valign' => 'top'))),
+    '#suffix' => theme('path_image_form_wrapper', 'cell_first_suffix'),
     '#disabled' => count($files) ? FALSE : TRUE
   );
   if (count($files)) {
@@ -414,16 +413,16 @@
       '#title' => t('Select an image'),
       '#default_value' => '',
       '#options' => $files,
-      '#prefix' => theme('path_image_form_wrapper', 'cell_last_prefix', array('cell' => array('valign' => 'top'))), 
-      '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix') 
+      '#prefix' => theme('path_image_form_wrapper', 'cell_last_prefix', array('cell' => array('valign' => 'top'))),
+      '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix')
     );
   }
   else {
     $form['path_image']['new_entry']['new_image_markup'] = array(
       '#type' => 'markup',
       '#value' => t('No files available for selection'),
-      '#prefix' => theme('path_image_form_wrapper', 'cell_last_prefix', array('cell' => array('valign' => 'top'))), 
-      '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix') 
+      '#prefix' => theme('path_image_form_wrapper', 'cell_last_prefix', array('cell' => array('valign' => 'top'))),
+      '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix')
     );
   }
 
@@ -434,7 +433,7 @@
     $form['path_image']['existing_entries'] = array(
       '#type' => 'fieldset',
       '#title' => t('Existing path %x', array('%x' => format_plural($num_of_rows, 'entry', 'entries'))),
-      '#tree' => TRUE,  
+      '#tree' => TRUE,
     );
     $row_counter = 0;
     while ($row = db_fetch_object($result)) {
@@ -449,8 +448,8 @@
           '#default_value' => $row->path,
           '#size' => 50,
           '#description' => t('Amend the path. <em>Note, no leading / (slash)</em>'),
-          '#prefix' => theme('path_image_form_wrapper', 'cell_first_prefix', array('cell' => array('valign' => 'top'))), 
-          '#suffix' => theme('path_image_form_wrapper', 'cell_first_suffix')         
+          '#prefix' => theme('path_image_form_wrapper', 'cell_first_prefix', array('cell' => array('valign' => 'top'))),
+          '#suffix' => theme('path_image_form_wrapper', 'cell_first_suffix')
         );
         $form['path_image']['existing_entries'][$row_counter]['image_file'] = array(
           '#type' => 'select',
@@ -458,21 +457,21 @@
           '#default_value' => $row->image_file,
           '#options' => $files,
           '#prefix' => theme('path_image_form_wrapper', 'cell_middle_prefix', array('cell' => array('valign' => 'top'))),
-          '#suffix' => theme('path_image_form_wrapper', 'cell_middle_suffix')        
-        );    
+          '#suffix' => theme('path_image_form_wrapper', 'cell_middle_suffix')
+        );
         $form['path_image']['existing_entries'][$row_counter]['delete'] = array(
           '#type' => 'checkbox',
           '#title' => t('Delete'),
-          '#prefix' => theme('path_image_form_wrapper', 'cell_last_prefix', array('cell' => array('valign' => 'middle'))), 
-          '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix')            
-        );    
+          '#prefix' => theme('path_image_form_wrapper', 'cell_last_prefix', array('cell' => array('valign' => 'middle'))),
+          '#suffix' => theme('path_image_form_wrapper', 'cell_last_suffix')
+        );
       }
       else {
         $form['path_image']['existing_entries'][$row_counter]['path_markup'] = array(
           '#type' => 'markup',
           '#value' => check_plain($row->path),
-          '#suffix' => '&nbsp; -- &nbsp;'    
-        );      
+          '#suffix' => '&nbsp; -- &nbsp;'
+        );
         $form['path_image']['existing_entries'][$row_counter]['image_file_markup'] = array(
           '#type' => 'markup',
           '#value' => t('No files available for selection'),
@@ -487,7 +486,7 @@
     '#type' => 'submit',
     '#value' => t('Save configuration')
   );
-  
+
   return drupal_get_form('path_image_settings_form', $form);
 }
 
@@ -495,16 +494,16 @@
  * Form validation function for the _settings page
  */
 function path_image_settings_form_validate($form_id, $form_values) {
-  
+
   $return_value = TRUE;
-  
+
   if ($form_values['default_image'] == 'no image selected') {
     form_set_error(
-      'default_image', 
+      'default_image',
       t('You must set this even if you do not intend to use it'));
     $return_value = FALSE;
-  }  
-  
+  }
+
   return $return_value;
 }
 
@@ -520,7 +519,7 @@
   variable_set('path_image_homepage_image', $form_values['homepage_image']);
   variable_set('path_image_homepage_use', $form_values['homepage_use']);
   variable_set('path_image_numeric_use', $form_values['numeric_use']);
-    
+
   $file_types = explode(',', $form_values['file_types']);
   if (is_array($file_types)) {
     foreach ($file_types as $k => $v) {
@@ -528,18 +527,18 @@
     }
     variable_set('path_image_file_types', $file_types);
   }
-  
+
   if (strlen($form_values['new_entry']['new_path']) &&
       strlen($form_values['new_entry']['new_image'])) {
-    
-    $pid = db_next_id('{path_image_data}');  
+
+    $pid = db_next_id('{path_image_data}');
     $sql = 'INSERT INTO {path_image_data} SET ' .
            ' pid = %d, '.
            ' path = "%s", '.
            ' image_file = "%s"';
     db_query($sql, $pid, $form_values['new_entry']['new_path'], $form_values['new_entry']['new_image']);
   }
-  
+
   if (isset($form_values['existing_entries']) && is_array($form_values['existing_entries'])) {
     foreach ($form_values['existing_entries'] as $entry) {
       if (isset($entry['delete']) && (int)$entry['delete']) {
@@ -555,8 +554,8 @@
       }
     }
   }
-  
-  drupal_set_message(t('Your settings have been saved'));  
+
+  drupal_set_message(t('Your settings have been saved'));
 }
 
 /**
@@ -567,37 +566,37 @@
   $table_attribs = '';
   if (isset($params['table']) && is_array($params['table'])) {
     foreach ($params['table'] as $key => $attrib) {
-      $table_attribs .= $key . '="' . $attrib . '" '; 
+      $table_attribs .= $key . '="' . $attrib . '" ';
     }
   }
 
   $row_attribs = '';
   if (isset($params['row']) && is_array($params['row'])) {
     foreach ($params['row'] as $key => $attrib) {
-      $row_attribs .= $key . '="' . $attrib . '" '; 
+      $row_attribs .= $key . '="' . $attrib . '" ';
     }
   }
 
   $cell_attribs = '';
   if (isset($params['cell']) && is_array($params['cell'])) {
     foreach ($params['cell'] as $key => $attrib) {
-      $cell_attribs .= $key . '="' . $attrib . '" '; 
+      $cell_attribs .= $key . '="' . $attrib . '" ';
     }
   }
-  
+
   switch ($arg) {
     case 'cell_first_prefix':
       return "<table $table_attribs ><tr $row_attribs ><td $cell_attribs >";
     case 'cell_first_suffix':
-      return "</td>";      
+      return "</td>";
     case 'cell_middle_prefix':
       return "<td $cell_attribs>&nbsp;</td><td $cell_attribs >";
     case 'cell_middle_suffix':
-      return "</td>";      
+      return "</td>";
     case 'cell_last_prefix':
       return "<td $cell_attribs >&nbsp;</td><td $cell_attribs >";
     case 'cell_last_suffix':
-      return "</td></tr></table>";      
+      return "</td></tr></table>";
     case 'new_line':
       return "<br $class />";
     case 'new_para':
@@ -611,20 +610,20 @@
  */
 function _path_image_get_image_files() {
   static $files = FALSE;
-  
+
   // if cache exists use it to save hitting the disk system
   if ($files !== FALSE) {
     return $files;
   }
-  
+
   $files = array();
-  
+
   $file_types = variable_get('path_image_file_types', array('gif', 'jpg', 'png'));
-  
-  $dir = $_SERVER['DOCUMENT_ROOT'] . '/' . 
-         file_directory_path() . '/' . 
+
+  $dir = $_SERVER['DOCUMENT_ROOT'] . '/' .
+         file_directory_path() . '/' .
          variable_get('path_image_repository', 'images');
-         
+
   if (is_dir($dir)) {
     if ($dh = opendir($dir)) {
       while (($file = readdir($dh)) !== false) {
@@ -636,31 +635,31 @@
       closedir($dh);
     }
   }
-  
+
   return $files;
 }
 
 /**
- * internal debug function 
+ * internal debug function
  */
 function _path_image_debug($x) {
-   
+
   if (!defined("PATH_IMAGE_DEBUG")) {
     return;
   }
- 
+
   if (is_array($x) || is_object($x)) {
     $t = split("\n", print_r($x, TRUE));
     foreach($t as $s) {
       $GLOBALS[PATH_IMAGE_MODULE_NAME]['debug'][] = $s;
-      error_log(" $s");      
+      error_log(" $s");
     }
   }
   else {
     $t = split("\n", $x);
     foreach($t as $s) {
       $GLOBALS[PATH_IMAGE_MODULE_NAME]['debug'][] = $s;
-      error_log(" $s");      
+      error_log(" $s");
     }
   }
 }
@@ -671,7 +670,7 @@
  */
 function _path_image_expand_sql($query) {
   _path_image_debug("_path_image_expand_sql()");
-  
+
   $args = func_get_args();
   array_shift($args);
   $query = db_prefix_tables($query);