Merge branch 'release-0.4.1'

build/ripping-cluster-worker.init-gentoo

@@ -11,7 +11,7 @@ start() {
 	ebegin "Starting ripping-cluster-worker"
 	start-stop-daemon --start --quiet \
 		--background --make-pidfile --pidfile ${PID_FILE} \
-		--chuid ${USER} --user ${USER} \
+		--user ${USER} \
 		--exec /usr/bin/php /usr/lib/ripping-cluster/source/worker/ripping-cluster-worker.php
 	eend $? "Failed to start ripping-cluster-worker"
 }
@@ -23,7 +23,9 @@ stop() {
 	local ret=$?
 	
 	eend ${ret} "Failed to stop ripping-cluster-worker"
-	${ret} || rm -f ${PID_FILE}
+	if [[ "${ret}" == 0 ]]; then 
+	    rm -f ${PID_FILE}
+	fi
 	
 	return ${ret}
 }

source/lib/RippingCluster/Main.class.php

@@ -37,7 +37,7 @@ class RippingCluster_Main extends SihnonFramework_Main {
                 $this->smarty->registerPlugin('modifier', 'formatDuration', array('RippingCluster_Main', 'formatDuration'));
                 $this->smarty->registerPlugin('modifier', 'formatFilesize', array('RippingCluster_Main', 'formatFilesize'));
 
-                $this->smarty->assign('version', '0.3');
+                $this->smarty->assign('version', '0.4.1');
                 $this->smarty->assign('messages', array());
                  
                 $this->smarty->assign('base_uri', $this->base_uri);

source/webui/pages/rips/setup.php

@@ -11,7 +11,7 @@ if ($req->exists('submit')) {
     
     // Update the recently used list
     $recent_output_directories = $config->get('rips.output_directories.recent');
-    if (( $key = array_search($_POST['rip-options']['output-directory'], $recent_output_directories, true))) {
+    if (( $key = array_search($_POST['rip-options']['output-directory'], $recent_output_directories, true)) >= 0) {
         // Move the entry to the top of the recently used list if necessary
         $recent_directory = array_splice($recent_output_directories, $key, 1);
         if ($key > 0) {

source/webui/templates/index.tpl

@@ -85,11 +85,11 @@
     
             <footer class="no-print">
                 <p>
-                    Powered by RippingCluster WebUI {$version}. Written by Ben Roberts.
+                    Powered by RippingCluster WebUI {$version}. Written by
+                    <a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>
                 </p>
                 <p>
-                    This work by <a xmlns:cc="http://creativecommons.org/ns#" href="http://benroberts.net" property="cc:attributionName" rel="cc:attributionURL">Ben Roberts</a>
+                    This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
-                    is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.
                     <br />
                     
                     <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">