@@ -599,15 +599,15 @@ Class CategoryList extends Partial { $html = ''; foreach($files as $key => $file) { // for each page within this category... - $vars = array( + $replacements = array( '/@url/' => $path.'/'.preg_replace('/^\d+?\./', '', $file).'/', '/@thumb/' => $page->link_path.'content/'.self::check_thumb($dir, $file) ); // create a MockPageInCategory to give us access to all the variables inside this PageInCategory $c = new ContentParser; $category_page = new MockPageInCategory(preg_replace('/\.\.\/content\//', '', $dir), $file); - $vars = array_merge($vars, $c->parse($category_page)); - $html .= preg_replace(array_keys($vars), array_values($vars), $loop_html); + $replacements = array_merge($replacements, $c->parse($category_page)); + $html .= preg_replace(array_keys($replacements), array_values($replacements), $loop_html); } return $html; @@ -673,7 +673,13 @@ Class Images extends Partial { $files = $page->image_files; foreach($files as $key => $file) { - $html .= preg_replace('/@url/', $dir.'/'.$file, $loop_html); + $name = preg_replace(array('/\.[\w\d]+?$/', '/^\d+?\./'), '', $file); + $replacements = array( + '/@url/' => $dir.'/'.$file, + '/@name/' => ucfirst(preg_replace('/-/', ' ', $name)), + ); + + $html .= preg_replace(array_keys($replacements), array_values($replacements), $loop_html); } return $html; @@ -693,17 +699,15 @@ Class Video extends Partial { // pull dimensions from file name (if they exist) if(preg_match('/(\d+?)x(\d+?)\./', $file, $matches)) $dimensions = array('width' => $matches[1], 'height' => $matches[2]); else $dimensions = array('width' => '', 'height' => ''); - $html .= preg_replace(array( - '/@url/', - '/@width/', - '/@height/' - ), array( - $dir.'/'.$file, - $dimensions['width'], - $dimensions['height'] - ), $loop_html); - } + $replacements = array( + '/@url/' => $dir.'/'.$file, + '/@width/' => $dimensions['width'], + '/@height/' => $dimensions['height'] + ); + + $html .= preg_replace(array_keys($replacements), array_values($replacements), $loop_html); + } return $html; } @@ -721,15 +725,13 @@ Class Swf extends Partial { // pull dimensions from file name (if they exist) if(preg_match('/(\d+?)x(\d+?)\./', $file, $matches)) $dimensions = array('width' => $matches[1], 'height' => $matches[2]); else $dimensions = array('width' => '', 'height' => ''); - $html .= preg_replace(array( - '/@url/', - '/@width/', - '/@height/' - ), array( - $dir.'/'.$file, - $dimensions['width'], - $dimensions['height'] - ), $loop_html); + $replacements = array( + '/@url/' => $dir.'/'.$file, + '/@width/' => $dimensions['width'], + '/@height/' => $dimensions['height'] + ); + + $html .= preg_replace(array_keys($replacements), array_values($replacements), $loop_html); } return $html; } app/stacey.inc.php 5a758aa311f7d4fde0dae06bdc56323441591e8d Anthony Kolber ae@aestheticallyloyal.com http://github.com/kolber/stacey/commit/b4bd530171b6a2f8dc09b12aca7252cc8f7ac504 b4bd530171b6a2f8dc09b12aca7252cc8f7ac504 2009-11-08T15:25:41-08:00 2009-11-08T15:25:41-08:00 Updated app files 70801d0be2cb1ab343f17e9e7d57af989ab0e8f7 Anthony Kolber ae@aestheticallyloyal.com