Fixing odds and ends for 1.2.1 release

Databases/db-upgrade-patches/database_upgrade-1.2.1b.sql

@@ -60,3 +60,5 @@ CREATE TABLE tblodkinstance
 WITH (
   OIDS=FALSE
 );
+
+UPDATE tblsupportedclient SET minversion='1.2.1' WHERE client='Tellervo WSI';

Native/BuildResources/LinBuild/firstrun.template

@@ -39,6 +39,7 @@ echo "make your choice.\n\n";
 // This makes sure we have sudo access without further passwords required
 pingSudo();
 
+
 echo "\n\n";
 echo "Press [enter] to continue...";
 $response = fgets(STDIN); 

Native/BuildResources/LinBuild/tellervo-server

@@ -105,6 +105,8 @@ if(isset($args["firstrun"]))
 
 	echo $colors->getColoredString("\n\nStep 4 - Setting up the Tellervo database...\n\n", "light_purple");
 	requireRoot();
+	// Make sure media store is accessible to www-data
+
 	createScriptsFromTemplates();
 	postgresSetup(true);
 	include($configfile);
@@ -177,6 +179,8 @@ if(isset($args["reconfigure"]) || isset($args["r"]))
 	// Reconfigure server
 	requireRoot();
 
+	exec("chown -R www-data:www-data /usr/share/tellervo-server/mediastore");
+
 	// Confirm the user wants to scrub and start from scratch  
 	echo "\nIf you continue, your existing Tellervo configuration and database will be\n";
 	echo "deleted.  Are you sure you want to proceed?  (y/N): ";
@@ -285,6 +289,8 @@ if (isset($args["configure"]) || isset($args["c"]))
 	// Configure
 	requireRoot();
 
+	exec("chown -R www-data:www-data /usr/share/tellervo-server/mediastore");
+
 	// Check if the server is already configured
 	if( (file_exists($configfile)) && (file_exists($dbsetupfile)) )
 	{

Native/BuildResources/tellervo.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="6.0.1" transformSequenceNumber="5">
   <directoryPresets config="../../target/classes/LinBuild/tellervo.desktop" />
-  <application name="Tellervo" distributionSourceDir="" applicationId="3241-8043-2524-6669" mediaDir="../../target/binaries/desktop/${compiler:sys.version}/${compiler:platformtype}" mediaFilePattern="tellervo-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="false" shrinkRuntime="true" shortName="Tellervo" publisher="University of Arizona" publisherWeb="http://www.tellervo.org" version="1.2.1-SNAPSHOT" allPathsRelative="true" backupOnSave="true" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="add89b377a765064" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
+  <application name="Tellervo" distributionSourceDir="" applicationId="3241-8043-2524-6669" mediaDir="../../target/binaries/desktop/${compiler:sys.version}/${compiler:platformtype}" mediaFilePattern="tellervo-${compiler:sys.version}-${compiler:sys.platform}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="false" shrinkRuntime="true" shortName="Tellervo" publisher="University of Arizona" publisherWeb="http://www.tellervo.org" version="1.2.1" allPathsRelative="true" backupOnSave="true" autoSave="true" convertDotsToUnderscores="false" macSignature="????" macVolumeId="add89b377a765064" javaMinVersion="1.7" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages />

pom.xml

@@ -746,7 +746,7 @@
 			<plugin>
 				<artifactId>jdeb</artifactId>
 				<groupId>org.vafer</groupId>
-				<version>0.8</version>
+				<version>1.5</version>
 				<executions>
 
 					<!-- Desktop Installer -->
@@ -820,6 +820,14 @@
 									</mapper>
 								</data>
 								<data>
+				                  <type>template</type>
+				                  <paths>
+				                    <path>/usr/share/tellervo-server/mediastore</path>
+				                    <user>www-data</user>
+				                    <group>www-data</group>
+				                  </paths>
+				                </data>
+								<data>
 									<src>${project.build.directory}/tellervo-pljava.jar</src>
 									<type>file</type>
 									<mapper>

src/main/php/inc/securityUser.php

@@ -330,7 +330,7 @@ function writeToDB($crudMode="create")
                     $this->setID(uuid::getUUID(), 0);
 
 		    // New record
-                    $sql = "insert into tblsecurityuser (securityuserid, username, password, firstName, lastName, odkpassword isactive) values (";
+                    $sql = "insert into tblsecurityuser (securityuserid, username, password, firstName, lastName, odkpassword, isactive) values (";
                     $sql.= "'".pg_escape_string($this->id)."', ";
                     $sql.= "'".pg_escape_string($this->username)."', ";
                     $sql.= "'".pg_escape_string($this->password)."', ";

src/main/php/odk/formList.php

@@ -61,11 +61,11 @@ function getFormList($theUsername)
 		echo "    <hash>md5:".md5($row['definition'])."</hash>\n";
 		if($securehttp===TRUE)
 		{
-    			echo "    <downloadUrl>https://".$domain."odk/forms?id=".$row['odkdefinitionid']."</downloadUrl>\n";
+    			echo "    <downloadUrl>https://".$domain."/odk/forms?id=".$row['odkdefinitionid']."</downloadUrl>\n";
 		}
 		else
 		{
-    			echo "    <downloadUrl>http://".$domain."odk/forms?id=".$row['odkdefinitionid']."</downloadUrl>\n";
+    			echo "    <downloadUrl>http://".$domain."/odk/forms?id=".$row['odkdefinitionid']."</downloadUrl>\n";
 		}
 		echo "  </xform>\n";
 	}

src/main/php/odk/index.php

@@ -0,0 +1,6 @@
+<?php
+?>
+<html>
+<h1>Tellervo ODK</h1>
+<p>These pages are designed to be used by an ODK client not a web browser.  Please read the Tellervo manual for me information.</p>
+</html>