Index: photoframe.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/photoframe/photoframe.module,v retrieving revision 1.1 diff -u -p -r1.1 photoframe.module --- photoframe.module 7 Nov 2007 05:38:56 -0000 1.1 +++ photoframe.module 25 Nov 2007 13:15:22 -0000 @@ -60,13 +60,13 @@ function photoframe_admin_settings() { // add the javascript. // Run through photoframe directory. All folders are considered frames - $path = drupal_get_path('module', 'photoframe') . "/"; + $path = drupal_get_path('module', 'photoframe'); $files = file_scan_directory($path,'(.?)',$nomask = array('.', '..', 'CVS'),'',FALSE); foreach ($files as $filename => $file) { // If the file doesn't have a '.' in it (this is my hacky way of figuring // out if it's a directory) - if (!strpos($filename,'.') && $file->basename != 'disabled') { + if (!strpos($file->basename,'.') && $file->basename != 'disabled') { // Add the stylesheet drupal_add_css(drupal_get_path('module','photoframe') . '/' . $file->basename . '/' . 'style.css'); // Add the javascript function call @@ -93,6 +93,8 @@ function photoframe_admin_settings() { * Theme the admin settings to display each frame. */ function theme_photoframe_admin_settings($form) { + global $base_path; + // Since the JS and CSS are only usually added for nodes, we need to // include them. drupal_add_js(drupal_get_path('module', 'photoframe') . '/photoframe.js'); @@ -111,7 +113,7 @@ function theme_photoframe_admin_settings $style = 'photoframe-' . $form['photoframes'][$key]['#description']; $form['photoframes'][$key]['#title'] = ''; $form['photoframes'][$key]['#description'] = ''; - $output .= '
 . '/sample.jpg)
 . '/sample.jpg)