Merge branch 'hotfixes' into development

install.sh

@@ -27,14 +27,13 @@ while [ "$everything_ok" != "y" ]; do
   echo
   echo "LODSPeaKr needs to know three (3) URIs to minimally configure itself:"
   echo 
-  echo    "(1/3) At what URL will `pwd` be available? (e.g. http://localhost/$parent/$home/)"
+  echo    "(1/3) At what URL will `pwd` be available? (e.g. http://localhost/$parent/)"
+  echo    "**Note** DO NOT include 'lodspeakr/' in the URL"
   echo -n "(default '$basedir'): "
   read -u 1 aux_basedir
   echo 
   aux_basedir="`echo $aux_basedir | sed 's/\/$//'`/" # remove any ending slash and append one.
-  if [ "$aux_basedir" != "/" ]; then
-    basedir=`dirname $aux_basedir | sed 's/\/$//'`/
-  fi
+  basedir=$aux_basedir
 
   ns=$basedir
   echo    "(2/3) What local namespace you will use?"

settings.inc.php.1326740890

+<?
+
+$conf['endpoint']['local'] = 'http://localhost/db/endpoint.php';
+$conf['home'] = '/Users/alvarograves/github/lodspeakr/';
+$conf['basedir'] = 'http://localhost/lodspeakr/';
+//$conf['debug'] = true;
+$conf['mirror_external_uris'] = false;
+
+/*ATTENTION: By default this application is available to
+ * be exported and copied (its configuration)
+ * by others. If you do not want that, 
+ * turn the next option as false
+ */ 
+$conf['export'] = true;
+
+#If you want to add/overrid a namespace, add it here
+$conf['ns']['local']   = 'http://localhost/lodspeakr/';
+
+$conf['types']['priorities']['local:AnotherClass'] = 10;
+$conf['types']['priorities']['local:AsDAsd'] = 2;
+
+?>