copia dell'android manifest... nn sn sicura che serva, ma melgio averla

.gitignore

@@ -1,3 +1,10 @@
+#Specific Android sec file#
+###########################
+ilovexm24.keystore
+myBuildConfig.json
+
+
+
 # Compiled platform #
 ###################
 platforms/

AndroidManifest.xml

@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='utf-8'?>
+<manifest android:hardwareAccelerated="true" android:versionCode="10501" android:versionName="1.5.1" package="xm24.digitigrafo.it" xmlns:android="http://schemas.android.com/apk/res/android">
+    <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <application android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
+            <intent-filter android:label="@string/launcher_name">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <provider android:authorities="${applicationId}.sharing.provider" android:exported="false" android:grantUriPermissions="true" android:name="nl.xservices.plugins.FileProvider">
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/sharing_paths" />
+        </provider>
+        <activity android:exported="true" android:name="com.adobe.phonegap.push.PushHandlerActivity" android:permission="${applicationId}.permission.PushHandlerActivity" />
+        <receiver android:name="com.adobe.phonegap.push.BackgroundActionButtonHandler" />
+        <receiver android:exported="true" android:name="com.google.android.gms.gcm.GcmReceiver" android:permission="com.google.android.c2dm.permission.SEND">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </receiver>
+        <service android:exported="false" android:name="com.adobe.phonegap.push.GCMIntentService">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+            </intent-filter>
+        </service>
+        <service android:exported="false" android:name="com.adobe.phonegap.push.PushInstanceIDListenerService">
+            <intent-filter>
+                <action android:name="com.google.android.gms.iid.InstanceID" />
+            </intent-filter>
+        </service>
+        <service android:exported="false" android:name="com.adobe.phonegap.push.RegistrationIntentService" />
+    </application>
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    
+    
+    
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+    <uses-permission android:name="${applicationId}.permission.PushHandlerActivity" />
+    <permission android:name="${applicationId}.permission.C2D_MESSAGE" android:protectionLevel="signature" />
+    <permission android:name="${applicationId}.permission.PushHandlerActivity" android:protectionLevel="signature" />
+</manifest>

README.md

@@ -3,6 +3,7 @@ App per xm, prende i contenuti dal sito e te li salva nel cellulare.
 <img src="https://git.lattuga.net/hacklabbo/Ilovexm24/raw/master/screenshot_post.png" style="width:300px;border:solid 1px black;border-radius:20px;" />
 <img src="https://git.lattuga.net/hacklabbo/Ilovexm24/raw/master/screenshot_eventi.png" style="width:300px;border:solid 1px black;border-radius:20px;" />
 <img src="https://git.lattuga.net/hacklabbo/Ilovexm24/raw/master/screenshot_menu.png" style="width:300px;border:solid 1px black;border-radius:20px;" />
+<img src="https://git.lattuga.net/hacklabbo/Ilovexm24/raw/master/screenshot_lab.png" style="width:300px;border:solid 1px black;border-radius:20px;" />
 
 ## Environment ##
 
@@ -87,6 +88,46 @@ Per installare il plugin sulla rete che non viene installato in automatico
 Per lanciare l'emulatore Android con l'applicazione.
 Ovviamente si deve aver configurato il proprio environment correttamente.
 
+## Aggiornamento
+
+Siam passati allal versione di Cordova 9 e la versione della piattaforma Android 8, per verificare, nella cartella del progetto IloveXM24:
+     $ cordova -v
+     9.0.0 (cordova-lib@9.0.1)
+ 
+     $ cordova platform list
+     Installed platforms:
+     android 8.0.0
+
+I plugin così:
+        $ cordova plugin list
+	cordova-plugin-compat 1.2.0 "Compat"
+	cordova-plugin-file 4.3.3 "File"
+	cordova-plugin-media 3.0.1 "Media"
+	cordova-plugin-network-information 1.3.4 "Network Information"
+	cordova-plugin-splashscreen 4.0.3 "Splashscreen"
+	cordova-plugin-whitelist 1.3.3 "Whitelist"
+	cordova-plugin-x-socialsharing 5.1.8 "SocialSharing"
+	cordova-sqlite-storage 2.0.4 "Cordova sqlite storage plugin"
+	es6-promise-plugin 4.2.2 "Promise"
+	phonegap-plugin-push 1.9.4 "PushPlugin"
+
+E le API dell'sdk Android, ora hanno target 28!
+Per aggiornarle, da linea di comando, nella cartella dove avete l'ambiente android, io ce l'ho in home/.android/
+	 $ ./android update sdk
+
+Accettate le malvagie licenze e scaricate.
+
+Poi il build pare funzionare :) yhuuu!
+
+Non ricordo se era bloccante o no, ma ci siamo fatte una copia dell AndroidManifest.xml dopo aver aggiunto la platform, così:
+	cd platforms/android/app/
+	cp src/main/AndroidManifest.xml AndroidManifest.xml
+
+## build app
+
+	cordova build android --release --buildConfig=myBuildConfig.json
+
+
 ### iOS ###
 
 Installando `phonegap-plugin-push` se si incontra questo errore:
@@ -99,7 +140,27 @@ Error: CocoaPods was not found. Please install version 1.0.1 or greater from htt
 
 Occore installare `CocoaPods` come descritto sulla [documentazione del plugin](https://github.com/phonegap/phonegap-plugin-push/blob/master/docs/INSTALLATION.md#ios-details)
 
-    
+## Download ##
+
+## Google Play ##
+
+Solo per chi ha un account google. 
+
+Sconsigliamo l'installazione dal Google Play perche' google come multinazionale profila ogni tuo gusto e l'utilizza a scopo commerciale. In pratica ti tratta come merce per accaparrarsi profitto. Se ti e' possibile quindi utilizza fdroid.
+
+https://play.google.com/store/apps/details?id=xm24.digitigrafo.it
+
+
+## Repository Privato Fdroid ##
+
+Repository gestito da hacklabbo, non e' il repository fdroid ufficiale. 
+
+Per poter utilizzare questo repository devi comunque scaricare l'applicazione [fdroid](https://f-droid.org/) e aggiungere questo repository ed attivarlo nella configurazione dell'applicazaione. E' un operazione piuttosto semplice da effettuare.
+
+https://fdroid.hacklabbo.indivia.net/
+
+P.S. Per chi sviluppa: ad ogni commit sarebbe opportuno aumentare l'ultima cifra della versione in config.xml (riga 2: version=1.0.2 -> version=1.0.3) in modo che fdroid riconosca e proponga l'aggiornamento.
+
 ## TODO, ISSUE e FEATURE ##
 
 Usiamo l'[issue tracker](https://git.lattuga.net/hacklabbo/Ilovexm24/issues) non il wiki.

config.xml

@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="xm24.digitigrafo.it" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="xm24.digitigrafo.it" version="1.5.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>I XM24</name>
+    <name>I love XM24</name>
     <description>
-            XM24
+            Spazio Sociale Autogestito XM24, Bolognina (BO): info, eventi, comunicati.. I love XM24, iloveXM24
         </description>
-    <author email="info@digitigrafo.it" href="http://hacklabbo.indivia.net">
+    <author email="hacklabbo@indivia.net" href="http://hacklabbo.indivia.net">
-            hacklabbo.indivia.net - digitigrafo.it
+            hacklabbo.indivia.net
         </author>
     <content src="index.html" />
-
+    <preference name="SplashScreen" value="res/splashscreen.png" />
-    <preference name = "SplashScreen" value = "res/splashscreen.png" />
     <preference name="SplashScreenDelay" value="3000" />
     <preference name="AutoHideSplashScreen" value="false" />
     <preference name="AndroidPersistentFileLocation" value="Compatibility" />
-    <plugin name="cordova-plugin-whitelist" spec="1" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
@@ -22,28 +20,36 @@
     <allow-intent href="mailto:*" />
     <allow-intent href="geo:*" />
     <platform name="android">
-        <allow-intent href = "market:*" />
+        <allow-intent href="market:*" />
-        <icon src = "res/icon.png" />
+        <icon src="res/icon.png" />
-        <preference name="AndroidPersistentFileLocation" value="Compatibility" />
-        <preference name = "SplashScreen" value = "res/splashscreen.png" />
-        <splash src = "res/splashscreen.png" />
-        <preference name = "AutoHideSplashScreen" value="false" />
-        <preference name = "SplashScreen" value = "splashscreen" />
-        <preference name = "SplashScreenDelay" value="3000" />
-        <preference name = "SplashMaintainAspectRatio" value="true" />
-        <preference name = "SplashShowOnlyFirstTime" value="false" />
         <preference name="AndroidPersistentFileLocation" value="Compatibility" />
+        <preference name="SplashScreen" value="res/splashscreen.png" />
+        <splash src="res/splashscreen.png" />
+        <preference name="AutoHideSplashScreen" value="false" />
+        <preference name="SplashScreen" value="splashscreen" />
+        <preference name="SplashScreenDelay" value="3000" />
+        <preference name="SplashMaintainAspectRatio" value="true" />
+        <preference name="SplashShowOnlyFirstTime" value="false" />
     </platform>
     <platform name="ios">
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
+    <plugin name="cordova-plugin-file" spec="~4.3.3" />
+    <plugin name="cordova-plugin-media" spec="~3.0.1" />
+    <plugin name="cordova-plugin-network-information" spec="~1.3.3">
+        <variable name="SENDER_ID" value="667898382143" />
+    </plugin>
+    <plugin name="cordova-plugin-splashscreen" spec="~4.0.3">
+        <variable name="SENDER_ID" value="667898382143" />
+    </plugin>
+    <plugin name="cordova-plugin-whitelist" spec="~1.3.2" />
+    <plugin name="cordova-plugin-x-socialsharing" spec="~5.1.8">
+        <variable name="SENDER_ID" value="667898382143" />
+    </plugin>
+    <plugin name="cordova-sqlite-storage" spec="~2.0.4" />
     <plugin name="phonegap-plugin-push" spec="~1.9.4">
         <variable name="SENDER_ID" value="667898382143" />
     </plugin>
-
+    <engine name="android" spec="^8.0.0" />
-    <plugin name="cordova-sqlite-storage" spec="~2.0.2" />
-    <plugin name="cordova-plugin-media" spec="~3.0.0" />
-    <plugin name="cordova-plugin-splashscreen" />
-    
 </widget>

hooks/after_prepare/030_remove_permissions.js

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+
+//
+// This hook removes specific permissions from the AndroidManifest.xml
+// The AndroidManifest is re-generated during the prepare stage,
+// so this must be run on the "after_prepare" hook.
+//
+
+
+// Configure the permissions to be forcefully removed.
+// NOTE: These permissions will be removed regardless of how many plugins
+//       require the permission. You can check the permission is only required
+//       by the plugin you *think* needs it, by looking at the "count" shown in
+//       your /plugins/android.json file.
+//       If the count is more than 1, you should search through
+//       the /plugins//plugin.xml files for <uses-permission> tags.
+
+var permsToRm = [ "RECORD_AUDIO", "MODIFY_AUDIO_SETTINGS", "READ_PHONE_STATE" ];
+
+var fs = require('fs');
+var path = require('path');
+var rootdir = process.argv[2];
+var manifestFile = path.join(rootdir, "plugin/cordova-plugin-media/config.xml");
+/*  
+"platforms/android/app/AndroidManifest.xml"
+
+*/
+
+fs.readFile( manifestFile, "utf8", function( err, data ) {
+    if (err)
+        return console.log( "Error reading plugin/cordova-plugin-media/config.xml", err );
+    
+    var result = data;
+    for(var i = 0; i < permsToRm.length; i++) {
+        var search = '<uses-permission android:name="android.permission.' + permsToRm[i] + '" />';
+        result = result.replace(search, '');
+    }
+
+    fs.writeFile( manifestFile, result, "utf8", function( err ){
+        if (err)
+            return console.log( "Error writing AndroidManifest.xml", err );
+    });
+} );

www/index.html

@@ -56,7 +56,7 @@
 <body>
     <!--panel -->
     <div data-role="panel" data-position="left" id="outside" data-theme="a" data-position-fixed="true" data-display="overlay" data-swipe-close="true">
-        <p><img src="image/ilovexm24_menu.png" class="panel_logo" /></p>
+        <p><img src="image/xm-logo.png" class="panel_logo" /></p>
         <ul data-role="listview">
             <li><a class="nav" href="#info">Home</a></li>
             <li><a class="nav" href="#ilove">I love XM24</a></li>

www/js/crud.events.js

@@ -54,11 +54,12 @@ EVENTS.getDataAndLoad = function (type) {
                     var evDesc = ai1ec.event.getDescription(event);
                     var evUrl = ai1ec.event.getUrl(event);
                     var evGeo = ai1ec.event.getGeo(event);
+					var evImg = ai1ec.event.getImage(event);
                     
                     var evInitDate = EVENTS.formatDate(ai1ec.event.getInitDate(event), EVENTS.storeDateFormat);
                     var evEndDate = EVENTS.formatDate(ai1ec.event.getEndDate(event), EVENTS.storeDateFormat);
                     
-                    FONTE.dbHandler.executeSql('INSERT INTO ' + table + ' VALUES (?,?,?,?,?,?,?)', [evId, evTitle, evDesc, evInitDate, evEndDate, evUrl, evGeo], 
+                    FONTE.dbHandler.executeSql('INSERT INTO ' + table + ' VALUES (?,?,?,?,?,?,?,?)', [evId, evTitle, evDesc, evInitDate, evEndDate, evUrl, evGeo, evImg], 
                     //onSuccess
                     function (resultSet) {
                         n_evs_ins++;

www/js/events.js

@@ -1,6 +1,6 @@
 var ai1ec = (function(){
     var API = {}, json = [], events = [];
-    
+
     //Categorie di eventi
     API.cats = {
         single: 34,
@@ -12,56 +12,60 @@ var ai1ec = (function(){
             endChar = uid.indexOf('@');
 
         return uid.substr(initChar+1, uid.length - uid.substr(endChar -1).length - initChar );
-    }; 
+    };
 
     //Parser di un evento dell'array tornato da getXmlData
     API.event = {
         getId : function(event) {
-            return event.uid ? getCleanId(event.uid) : null;
+            return event.properties.uid ? getCleanId(event.properties.uid.text) : null;
         },
-        
+
         getTitle : function(event) {
-            return event.summary || null;
+            return event.properties.summary.text || null;
         },
-    
+
         getDescription : function(event) {
-            return event.description || "";
+            return event.properties.description.text || "";
         },
-    
+
         getInitDate : function(event) {
-            return event.dtstart && event.dtstart._ ? event.dtstart._ : "";
+            return event.properties.dtstart && event.properties.dtstart["date-time"] ? event.properties.dtstart["date-time"] : "";
         },
-    
+
         getEndDate : function(event) {
-            return event.dtend && event.dtend._ ? event.dtend._ : "";
+            return event.properties.dtend && event.properties.dtend["date-time"] ? event.properties.dtend["date-time"] : "";
         },
-    
+
         getCats : function(event) {
-            return event.categories || "";
+            return event.properties.categories.text || "";
         },
-        
+
         getTags : function(event) {
-            return event["x-tags"] && event["x-tags"]._ ? event["x-tags"]._ : "";
+            return event.properties["x-tags"] && event.properties["x-tags"]._ ? event.properties["x-tags"]._ : "";
         },
-    
+
         getUrl : function(event) {
-            return event.url && event.url.$ && event.url.$.uri ? event.url.$.uri : "";
+            return event.properties.url && event.properties.url.uri && event.properties.url.uri ? event.properties.url.uri : "";
         },
-        
+
         getContact : function(event) {
-            return event.contact || "";
+            return event.properties.contact || "";
         },
-        
+
         getGeo : function(event) {
-            return event.geo || "";
+            return event.properties.location.text || "";
         },
-        
+
-        //Regole per gli evebti ripetitivi
+        //Regole per gli eventi ripetitivi
         getRule : function(event) {
-            return event.rrule || "";
+            return event.properties.rrule || "";
         },
+
+    		getImage : function(event){
+    			return event.properties['x-wp-images-url'] && event.properties['x-wp-images-url'].unknown ? event.properties['x-wp-images-url'].unknown : "";
+    		},
     };
-    
+
     var getXmlData = function(url, catId, callback) {
         $.ajax({
             url: url,
@@ -69,7 +73,7 @@ var ai1ec = (function(){
             method: 'GET',
             success: function(res) {
                 json[catId] = $.xml2json(res);
-                events[catId] = json[catId]["#document"].vcalendar.vevent;                
+                events[catId] = json[catId]["#document"].icalendar.vcalendar.components.vevent;
                 console.log(events[catId]);
                 return callback(events[catId]);
             },
@@ -79,13 +83,13 @@ var ai1ec = (function(){
             }
         });
     };
-    
+
     var getDefaultUrl = function(catId){
         catId = catId || API.cats.single;
-        
+
         return API.remote.site + API.remote.q + "&" + API.remote.catq + catId + "&" + API.remote.xmlq;
-     }
+     };
-    
+
     //Oggetto che gestisce attività remote
     API.remote = {
         site : 'http://www.ecn.org/xm24',
@@ -95,20 +99,20 @@ var ai1ec = (function(){
         xmlq : 'xml=true',
         win : 'window=true',
         //post_ids
-        
+
         //Torna un array con tutti gli eventi organizzati da xm24, un array vuoto se errore.
         getAllEvents : function(catId, callback) {
             var url = getDefaultUrl(catId);
             getXmlData(url, catId, callback);
-        }, 
+        },
 
         //Torna un array con gli eventi tra -30 e +30 giorni da oggi, un array vuoto se errore.
         getLastEvents : function(catId, callback) {
             var url = getDefaultUrl(catId) + '&' + API.remote.win;
             getXmlData(url, catId, callback);
-        }, 
+        },
 
     }
-    
+
     return API;
 })();

www/js/progetti.js

@@ -12,12 +12,12 @@ PROJECT.labs = [
     old_event: "", //un vecchio evento
     site: "http://ampioraggio.noblogs.org", //sito personale
     contatto : "", //email
-    page: "http://www.ecn.org/xm24/?page_id=16", //pagina su sito xm24
+    page: "http://www.ecn.org/xm24/ciclofficina-ampioraggio", //pagina su sito xm24
     sn: "", //social network
 },
 {   collettivo: "SIM",
     dshort: '“Nessuno educa nessuno, nessuno educa se stesso, gli uomini'+
-            'si educano insieme, con la mediazione del mondo.” – Paulo Freire,',
+            'si educano insieme, con la mediazione del mondo.” – Paulo Freire',
     dlong: "La Scuola d’Italiano CON migranti del XM24 è una scuola "+
             "autogestita che unisce al percorso linguistico un percorso politico, sia "+
             "perchè si oppone alle leggi razziste dello stato, sia perchè concepisce "+
@@ -25,27 +25,33 @@ PROJECT.labs = [
             "di emancipazione, autodefinizione e socializzazione.",
     when : [
       {day: "Lun", hour: ["19:00", "21:00"],  title:"Scuola Italiano con Migranti"},
-      {day: "Mar", hour: ["19:00", "21:00"],  title:"Scuola Italiano con Migranti"},
+	  {day: "Lun", hour: ["21:00", "23:00"],  title:"Assemlea di gestione SIM"},
-      {day: "Mer", hour: ["19:00", "21:00"],  title:"Scuola Italiano con Migranti"}
+      {day: "Mar", hour: ["19:00", "21:00"],  title:"Scuola Italiano con Migranti"}
     ],
     old_event: "", //un vecchio evento
     site: "http://simxm24.noblogs.org", //sito personale
     contatto : "", //email
     page: "", //pagina su sito xm24
-    sn: "", //social network
+    sn: "https://www.fb.com/infoschockxm24", //social network
 },
 {   collettivo: "Hacklabbo",
-    dshort: "Serata di smanettamento collettivo, giochi, confronto. Sottoterra nascono idee, serpeggiano progetti, si condividono codice, saldatori e birrette.",
+    dshort: "Serata di smanettamento collettivo, giochi, confronto. Sottoterra nascono idee, "+
-    dlong: "Le tecnologie invasive, l’imposizione di una socialita’ predigerita da parte dei colossi dell’informatica e dei media, la profilazione pervasiva a scopo commerciale e di controllo sociale, la censura governativa ed aziendale e la commercializzazione di massa di prodotti hardware e software che utilizzano licenze limitanti e brevetti intellettuali come armi legali e dogane virtuali sono gabbie sociali in cui l’utente viene rinchiuso." +
+            "serpeggiano progetti, si condividono codice, saldatori e birrette.",
-            "Per uscirne analizziamo, smontiamo e scardiniamo le meccaniche in cui ci siamo fatti inscatolare rivendicando la libera circolazione (analogica e digitale) dell’informazione, il diritto alla privacy, all’anonimato e alla liberta di espressione ed invenzione e condividiamo conoscenza autoproducendo dal basso strumenti alternativi ed infrastrutture autonome di comunicazione per una partecipazione politica consapevole.",
+    dlong: "Analizziamo e smontiamo e scardiniamoLe tecnologie invasive, l’imposizione "+
+            "di una socialita’ predigerita da parte dei colossi dell’informatica "+
+            "e dei media, la profilazione, la censura licenze limitanti e brevetti "+
+            "Rivendicando la libera circolazione "+
+            "(analogica e digitale) dell’informazione, il diritto alla privacy, "+
+            "all’anonimato e alla liberta di espressione ed invenzione. Condividiamo "+
+            "conoscenza autoproducendo dal basso strumenti alternativi ed infrastrutture "+
+            "autonome di comunicazione per una partecipazione politica consapevole.",
     when : [
-        {day: "Mer", hour: ["20:00", "23:00"],  title:"Hacklabbo" },
+        {day: "Mer", hour: ["21:00", "24:00"],  title:"Hacklabbo" },
     ],
     old_event: "", //un vecchio evento
     site: "http://liste.indivia.net/listinfo/hacklabbo", //sito personale
     contatto : "", //email
     page: "http://www.ecn.org/xm24/hacklabbo/", //pagina su sito xm24
-    sn: "", //social network
 },
 {   collettivo: "Infoshock",
     dshort: "L’ InfoShock di XM24 è uno spazio di consultazione e distribuzione "+
@@ -54,7 +60,7 @@ PROJECT.labs = [
             "sociale, di incontro, confronto e condivisione, un veicolo sperimentale e "+
             "creativo per la trasmissione della cultura e della politica.",
     when : [
-        {day: "Giov", hour: ["18:00", "23:00"],  title:"Apertura spazio Infoshock" },
+        {day: "Giov", hour: ["20:00", "23:00"],  title:"Apertura spazio Infoshock" },
     ],
     old_event: "", //un vecchio evento
     site: "https://infoshockxm24.noblogs.org", //sito personale
@@ -68,7 +74,9 @@ PROJECT.labs = [
             "applicare la creazione legata al mondo del visuale. La serigrafia come "+
             "tecnica di stampa manuale legata al mondo d.i.y. si pone in maniera "+
             "opposta alle logiche della produzione industriale massiva e omologante.",
-    when : [],
+    when : [
+		{day: "Mer", hour: ["19:30", "22:00"],  title:"Apertura serigrafia"},
+	],
     old_event: "", //un vecchio evento
     site: "", //sito personale
     contatto : "serixm@autistici.org", //email
@@ -82,14 +90,15 @@ PROJECT.labs = [
             "tecnica di stampa manuale legata al mondo d.i.y. si pone in maniera "+
             "opposta alle logiche della produzione industriale massiva e omologante.",
     when : [
-        {day: "Mar", hour: ["18:30", "20:30"],  title:"Hata Yoga"},
+        {day: "Mar", hour: ["18:30", "20:00"],  title:"Hata Yoga"},
-        {day: "Mer", hour: ["20:30", "22:30"],  title:"Hata Yoga meditativa)"},
+        {day: "Mer", hour: ["20:30", "22:30"],  title:"Hata Yoga meditativa"},
-        {day: "Gio", hour: ["18:30", "21:00"],  title:"Hata Yoga"},
+		{day: "Lun", hour: ["20:30", "22:30"],  title:"Hata Yoga meditativa"},
+        {day: "Gio", hour: ["18:30", "20:00"],  title:"Hata Yoga"},
         {day: "Lun", hour: ["19:00", "21:00"],  title:"Tessuti aerei"},
         {day: "Mer", hour: ["19:00", "21:00"],  title:"Tessuti aerei"},
         {day: "Ven", hour: ["19:00", "21:00"],  title:"Tessuti aerei"},
         {day: "Sab", hour: ["15:00", "17:00"],  title:"Shiatsu"},
-        {day: "Lun", hour: ["15:00", "17:00"],  title:"Acrobalance"}
+        //{day: "Lun", hour: ["15:00", "17:00"],  title:"Acrobalance"}
     ],
     old_event: "", //un vecchio evento
     site: "http://liste.indivia.net/listinfo/pallestra", //sito personale
@@ -104,15 +113,15 @@ PROJECT.labs = [
             "di insegnare a praticare una disciplina che ha come principi l’uguaglianza "+
             "e il rispetto reciproco",
     when : [
-        {day: "Lun", hour: ["20:00", "22:00"],  title:"Pugilato"},
+        {day: "Lun", hour: ["19:00", "21:00"],  title:"Pugilato"},
-        {day: "Mer", hour: ["20:00", "22:00"],  title:"Pugilato Principianti"},
+        {day: "Mer", hour: ["19:00", "21:00"],  title:"Pugilato Principianti"},
-        {day: "Ven", hour: ["20:00", "22:00"],  title:"Pugilato"},
+        {day: "Ven", hour: ["19:00", "21:00"],  title:"Pugilato"},
     ],
     old_event: "", //un vecchio evento
     site: "http://liste.indivia.net/listinfo/pallestra", //sito personale
     contatto : "palestrapopolarestevenson@autistici.org", //email
     page: "http://www.ecn.org/xm24/palestrina-libera/", //pagina su sito xm24
-    sn: "https://www.facebook.com/palestrapopolarestevenson", //social network
+    sn: "https://www.fb.com/palestrapopolarestevenson", //social network
 },
 {   collettivo: "Lab57 Alchemica",
     dshort: "Ascolto psicologico e punto di primo soccorso",
@@ -126,7 +135,7 @@ PROJECT.labs = [
     old_event: "", //un vecchio evento
     site: "http://lab57.indivia.net", //sito personale
     contatto : "lab57@indivia.net", //email
-    page: "http://www.ecn.org/xm24/evento/sportello-consulenza-lab57alchemica/", //pagina su sito xm24
+    page: "http://www.ecn.org/xm24/alchemicalab57/", //pagina su sito xm24
     sn: "", //social network
 },
 {   collettivo: "Campi aperti",
@@ -164,11 +173,7 @@ PROJECT.labs = [
     when : [
         {day: "Mar", hour: ["20.30", "24:30"],  title:"Assemblea pubblica Xm24"},
     ],
-    old_event: "", //un vecchio evento
     site: "http://www.ecn.org/xm24/", //sito personale
-    contatto : "", //email
-    page: "http://www.ecn.org/xm24/", //pagina su sito xm24
-    sn: "", //social network
 },
 {   collettivo: "No Borders",
     dshort: "Lottiamo contro tutte le frontiere, fisiche e immaginarie, e siamo per la libertà di movimento di tutti e tutte.",
@@ -236,18 +241,26 @@ var init = true;
 
 PROJECT.hr = "<hr class='post-divider'>";
 
-PROJECT.getHtmlA = function(label, url, _class) {
+var getLabelUrl = function(url){
+    var label = url.replace(/(http|https):\/\/(www\.)*/,'')
+                   .replace(/\/\s*$/, ""); //l'ultima barra
+                   
+    return label;
+};
+
+PROJECT.getHtmlA = function(label, url, _class, isMail) {
     if(!url)
         return "";
-        
-    
     
     _class  = _class || "";
     
-    return  "<span class='"+_class+"'>" + label + "</span>"+
+    var link = isMail ? "mailto:" + url : url;
-            "<a class='"+_class+"' href='" + url + "' rel='external'>" + 
+    
-                url + 
+    return  "<span class='e_link title "+_class+"'>" + label + "</span>"+
-            "</a>";
+            "<a class='e_link e_url"+_class+"' href='" + link + "' rel='external'>" + 
+                getLabelUrl(url) + 
+            "</a>" + 
+            "<br>";
 };
 
 PROJECT.getHtmlDate = function(evt, noDay) {
@@ -265,22 +278,28 @@ PROJECT.getHtmlDate = function(evt, noDay) {
 };
 
 PROJECT.labOrder = function(lab){
-    var events = "<ul>";
+    var events = "";
     for(var e = 0; e < lab.when.length; e++) {
-        events += "<ol>" + PROJECT.getHtmlDate(lab.when[e]) + "</ol>";
+        events += "<li>" + PROJECT.getHtmlDate(lab.when[e]) + "</li>";
+    }
+    
+    if(events !== '') {
+        events = "<small>Orari:</small>"+ 
+                 "<ul>" +
+                    events +
+                 "</ul>";
     }
-    events += "</ul>";
     
     var li =  "<li>"+
-                "<span class='title'>" + lab.collettivo + "</span>"+
+                "<p class='title'>" + lab.collettivo + "</p>"+
-                "<br>"+
+                "<p class='dshort'>" + lab.dshort + "</p>"+
-                "<span class='dshort'>" + lab.dshort + "</span>"+
+                PROJECT.getHtmlA("Url: ", lab.page) + 
-                "<br>"+
+                PROJECT.getHtmlA("Sito: ", lab.site) +
-                PROJECT.getHtmlA("Sito:", lab.site)+
+                PROJECT.getHtmlA("Email: ", lab.contatto, null, true) +
-                PROJECT.getHtmlA("Social Network", lab.sn)+
+                PROJECT.getHtmlA("Social: ", lab.sn)+
-                events+
+                "<br>" +
-                //"<small>" + cleanTime + "</small>"+
+                events +
-                "<hr class='post-divider'>"+
+                PROJECT.hr +
               "</li>";
     
     return li;
@@ -374,4 +393,4 @@ PROJECT.render = function() {
     $('#project p').html("<ul>" + lab + "</ul>");
     
     init = false;
-};
+};

www/js/query.js

@@ -1,6 +1,5 @@
 function myJsonCategory(Qcategory, div, addTagCategory) {
-    $.mobile.loading('show');
+    FONTE.dbHandler.executeSql("SELECT DISTINCT * FROM xm24_posts WHERE category = ? ORDER BY date COLLATE NOCASE DESC;", [Qcategory], function (resultSet) {
-    FONTE.dbHandler.executeSql("SELECT * FROM xm24_posts WHERE category = ? ORDER BY date COLLATE NOCASE DESC;", [Qcategory], function (resultSet) {
         var items = [];
         for (var i = 0; i < resultSet.rows.length; i++) {
             var val = JSON.parse(resultSet.rows.item(i).post);
@@ -83,7 +82,10 @@ var drawListPost = function(div, resultSet, position) {
     } else if(position == 'prepend'){
         ul.prependTo(div);
     }
-    $.mobile.loading('hide');
+    
+    setTimeout(function () {
+        $.mobile.loading('hide');
+    }, 1000);
 };
 
 var appendPostList = function(div, resultSet, categories, fallback) {
@@ -144,7 +146,7 @@ var getCategoryWhere = function(categories) {
 
 var POST = POST || {};
 POST.sql = {
-    init: "SELECT * FROM xm24_posts JOIN xm24_cats_to_posts USING(id) WHERE ",
+    init: "SELECT DISTINCT * FROM xm24_posts JOIN xm24_cats_to_posts USING(id) WHERE ",
     end : "ORDER BY date COLLATE NOCASE DESC LIMIT ?"
 };
 
@@ -195,7 +197,7 @@ function myJsonLastPage(div) {
     var firstTime = storage.getItem('db_lastnews_firsttime');
     if (firstTime != 'yes') {
         if (lastnewsDate) {
-            FONTE.dbHandler.executeSql("SELECT * FROM xm24_posts WHERE date > ? ORDER BY date COLLATE NOCASE DESC LIMIT 40;", [lastnewsDate], function (resultSet) {
+            FONTE.dbHandler.executeSql("SELECT DISTINCT * FROM xm24_posts WHERE date > ? ORDER BY date COLLATE NOCASE DESC LIMIT 40;", [lastnewsDate], function (resultSet) {
                 var items = [];
                 $(div).empty();
                 if (resultSet.rows.length > 0) {
@@ -232,7 +234,7 @@ function myJsonLastPage(div) {
 
 function myJsonCategoryPaginated(Qcategory, div, pageNumber) {
     $.mobile.loading('show');
-    FONTE.dbHandler.executeSql("SELECT * FROM xm24_posts WHERE category = ? ORDER BY date COLLATE NOCASE DESC;", [Qcategory], function (resultSet) {
+    FONTE.dbHandler.executeSql("SELECT DISTINCT * FROM xm24_posts WHERE category = ? ORDER BY date COLLATE NOCASE DESC;", [Qcategory], function (resultSet) {
         var items = [];
         $(div).empty();
         for (var i = 0; i < resultSet.rows.length; i++) {
@@ -298,11 +300,15 @@ function drawEvent(div_title, div_content, resultSet){
         var id = val.id;
         var title = val.title;
         var url = val.url;
-        var content = val.description;
+        var content = entityToHtml(val.description);
         var geo = val.geo;
+		var imgUrlThumb = getImageUrl(val.img, 'thumb');
 
         $(div_title).html(title);
-        $(div_content).html("<small>" + evInitDate +"-" + evEndDate +"</small><p>" + content + "</p>");
+		var img = imgUrlThumb != "" ? "<a href='" + getImageUrl(val.img, 'large') + "'>" +
+										"<img src='" + imgUrlThumb + "'/>" +
+									  "</a><br>" : "";
+        $(div_content).html(img + "<small>" + evInitDate +"-" + evEndDate +"</small><p>" + content + "</p>");
         renderShareButton(div_content, title, url, evInitDate + " "+ evEndDate);
     }
 }
@@ -313,7 +319,7 @@ function myJsonPost(Qid, div_title, div_content, _class) {
         table = EVENTS.table.single;
     }
 
-    FONTE.dbHandler.executeSql("SELECT * FROM " + table + " WHERE id = ?;", [Qid], function(resultSet) {
+    FONTE.dbHandler.executeSql("SELECT DISTINCT * FROM " + table + " WHERE id = ?;", [Qid], function(resultSet) {
         if(!_class){
             drawPost(div_title, div_content, resultSet);
         } else {
@@ -325,7 +331,7 @@ function myJsonPost(Qid, div_title, div_content, _class) {
 function myJsonPage(Qid, div_title, div_content) {
     $.mobile.loading('show');
     var pageId = parseInt(Qid);
-    FONTE.dbHandler.executeSql("SELECT * FROM xm24_pages WHERE id = ?;", [pageId], function (resultSet) {
+    FONTE.dbHandler.executeSql("SELECT DISTINCT * FROM xm24_pages WHERE id = ?;", [pageId], function (resultSet) {
         for (var i = 0; i < resultSet.rows.length; i++) {
             var data = resultSet.rows.item(i);
             var id = data.id;
@@ -342,7 +348,7 @@ function myJsonPage(Qid, div_title, div_content) {
 
 function myJsonRandomPost(div_title, div_content) {
     $.mobile.loading('show');
-    FONTE.dbHandler.executeSql("SELECT * FROM xm24_posts ORDER BY RANDOM() LIMIT 1;", [], function (resultSet) {
+    FONTE.dbHandler.executeSql("SELECT DISTINCT * FROM xm24_posts ORDER BY RANDOM() LIMIT 1;", [], function (resultSet) {
         for (var i = 0; i < resultSet.rows.length; i++) {
             var val = JSON.parse(resultSet.rows.item(i).post);
             var id = val.id;
@@ -373,7 +379,8 @@ function createDB() {
         //FONTE.dbHandler.executeSql('CREATE TABLE IF NOT EXISTS xm24_tags (id INTEGER PRIMARY KEY, title, tag)');
         //FONTE.dbHandler.executeSql('CREATE TABLE IF NOT EXISTS xm24_tags_to_posts (id, tagid)');
         //FONTE.dbHandler.executeSql('CREATE TABLE IF NOT EXISTS xm24_pages (id INTEGER PRIMARY KEY, title, date, page)');
-        FONTE.dbHandler.executeSql('CREATE TABLE IF NOT EXISTS xm24_events_single (id INTEGER PRIMARY KEY, title, description, initDate, endDate, url, geo)');
+		FONTE.dbHandler.executeSql('DROP TABLE IF EXISTS xm24_events_single');
+        FONTE.dbHandler.executeSql('CREATE TABLE IF NOT EXISTS xm24_events_single (id INTEGER PRIMARY KEY, title, description, initDate, endDate, url, geo, img)');
         //FONTE.dbHandler.executeSql('CREATE TABLE IF NOT EXISTS xm24_tags_to_events (id, tagid)');
         //FONTE.dbHandler.executeSql('CREATE TABLE IF NOT EXISTS xm24_events_repeat (id INTEGER PRIMARY KEY, title, description, initDate, endDate, url, geo)');
     }, function () {

www/js/update.js

@@ -245,9 +245,9 @@ function getLastSinglePageRecur(url, pagenum, categories) {
                 });
             });
 
-            if (data.length == 0) {
+            // if (data.length === 0) {
-                renderLastNews(FONTE.contentListClass, categories);
+            //     renderLastNews(FONTE.contentListClass, categories);
-            }
+            // }
         },
         error: JSONErrorHandler
     });

www/js/util.js

@@ -8,7 +8,7 @@ function initStorage() {
 }
 
 /*per network info*/
-function checkConnection(code, msgConnect) {
+function checkConnection(code, msgConnect, print) {
     var msgTitle = "Non sei connesso";
     msgConnect = msgConnect ||  "Occore essere connessi per poter ricevere i nuovi articoli";
 
@@ -23,7 +23,8 @@ function checkConnection(code, msgConnect) {
     states[Connection.CELL] = 'Cell generic connection';
     states[Connection.NONE] = 'No network connection';
     if (states[networkState] == 'Unknown connection' || states[networkState] == 'No network connection') {
-        toastr.warning(msgConnect, msgTitle);
+        if(! print)
+            toastr.warning(msgConnect, msgTitle);
         console.log(code);
         return false;
     } else {
@@ -58,6 +59,15 @@ function entityToHtml(string) {
     return string;
 }
 
+function getImageUrl(str, dim) {
+	var sstr = str.split(";");
+	for(var i = 0; i < sstr.length; i++) {
+		if(sstr[i].indexOf(dim) > -1){
+			return sstr[i +1];
+		}
+	}
+}
+
 var entity_table = {
   // 34: "&quot;",     // Quotation mark. Not required
   38: "&amp;",        // Ampersand. Applied before everything else in the application

www/js/vendor/xml2json.js

@@ -63,6 +63,9 @@
 
 		for (i = 0; i < xml.childNodes.length; i++) {
 			node = xml.childNodes[i];
+			if (node.nodeName === "#comment")
+				continue;
+				
 			if (node.nodeType === 1) {
 
 				if (node.attributes.length === 0 && node.childElementCount === 0){
@@ -116,7 +119,7 @@
 		}
 
 		var root = {};
-		
+
 		if (xml.attributes && xml.attributes.length === 0 && xml.childElementCount === 0){
 		  root[xml.nodeName] = normalize(xml.textContent, options);
 		} else {
@@ -133,4 +136,4 @@
 	} else if (typeof window !== 'undefined') {
 		window.xml2json = xml2json;
 	}
-})();
+})();