Index: private/themesite.class.php =================================================================== --- private/themesite.class.php (revision 23665) +++ private/themesite.class.php (working copy) @@ -566,9 +566,9 @@ * For all .wps and .rwps, run checkwps of both release and current for * all applicable targets */ - foreach(glob('.rockbox/wps/*wps') as $file) { + foreach(glob('.rockbox/wps/*{wps,sps}',GLOB_BRACE) as $file) { $p = $this->my_pathinfo($file); - $lcd = ($p['extension'] == 'rwps' ? $remotelcd : $mainlcd); + $lcd = ($p['extension'] == 'rwps' || $p['extension'] == 'rsps' ? $remotelcd : $mainlcd); foreach(array('release', 'current') as $version) { foreach($this->lcd2targets($lcd) as $shortname) { $result = array(); @@ -639,6 +639,8 @@ $files = array(); $wpsfound = array(); $rwpsfound = array(); + $spsfound = array(); + $rspsfound = array(); $cfgfound = array(); $shortname = ''; $cfg = ''; @@ -653,11 +655,15 @@ $totalsize += zip_entry_filesize($ze); $files[] = $filename; - /* Count .wps and .rwps files for later checking */ + /* Count .wps and .rwps and [.r]sps files for later checking */ if (strtolower($pathinfo['extension']) == 'wps') $wpsfound[] = $filename; if (strtolower($pathinfo['extension']) == 'rwps') $rwpsfound[] = $filename; + if (strtolower($pathinfo['extension']) == 'sps') + $rwpsfound[] = $filename; + if (strtolower($pathinfo['extension']) == 'rsps') + $rwpsfound[] = $filename; /* Check that all files are within .rockbox */ if (strpos($filename, '.rockbox') !== 0) @@ -669,6 +675,8 @@ /* Save the contents for later checking */ $cfg = $this->getzipentrycontents($zip, $ze); $cfgfound[] = $filename; + case 'sps': + case 'rsps': case 'wps': case 'rwps': if ($shortname === '') @@ -738,6 +746,12 @@ if (count($rwpsfound) > 1) $err[] = sprintf("More than one .rwps found (%s).", implode(', ', $rwpsfound)); + + if (count($spsfound) > 1) + $err[] = sprintf("More than one .sps found (%s).", implode(', ', $spsfound)); + + if (count($rspsfound) > 1) + $err[] = sprintf("More than one .rsps found (%s).", implode(', ', $rspsfound)); return $err; }