- files_reader: v1.2.2, fixes incompatibility with Owncloud due to

differences in the way NC and OC encode oc_appconfig (#75)

files_reader/appinfo/info.xml

@@ -30,7 +30,7 @@ See [README] for more exhaustive information on features and potential misfeatur
    [README]: https://github.com/Yetangitu/owncloud-apps/blob/master/files_reader/README.md
 	]]>
     </description>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <licence>AGPL</licence>
     <author>Frank de Lange</author>
     <documentation>

files_reader/appinfo/signature.json

@@ -6,7 +6,7 @@
         "ajax\/personal.php": "fbd21da9f8c4ea90dd549e82479aea877214b3b0ac102e4c4abc8c4e5914d77253bd1b82c36093ad7e21e7b85c78433006927a607a853b37c664f4f28236cbdf",
         "appinfo\/app.php": "347e7c861afcd5c4ad54af36a0d393c6108abd1cbc50524bede213c3cddcd7701a484ed14d9fe64ed9c6cf9e7fc37618b7ba4e8fc74b775c9c43112860ca6543",
         "appinfo\/database.xml": "111a18a81749237ad4e23c94f0b0986e08964c8b1ae5495b0dfe082f4801dc8951eb7c862f96edc8493eba1c4808c2227cde1ab48572d806b026c37abab07a85",
-        "appinfo\/info.xml": "c7daa8efe0a4b864ea44e612a098d5e70b2a2de9749e52c779df40baeccdade278926b4b13b352020373478dcf7408f57e8c9ec7c19a492d073127f6bc601967",
+        "appinfo\/info.xml": "8c2e6d2c42df2d9e17eee978cc49f1abf7a284d6fe7ec2515e917961ccee3a648f455a9d127d6df1231adf35b1118a004d27788658b6bf90c3f7a861c619d854",
         "appinfo\/routes.php": "64eaeaba5915721487dddef721dd4d747b070a658653e3c74287607faa7f3553bba907761779227a0c08870cc86420bdd97a4764887e4137f960d5bcb1e8006c",
         "css\/settings.css": "4c6d3bd224ad754e5396eeea719fb16ad975a2bd7f9dc363b4c7faf3a1e8c16c317b2b4092845280456e922048afb2155e43dcca108ac1ba535c83755ac27e59",
         "img\/app.svg": "88bc2059bd09013de866eaf61be0207bb96f4b84cfa3df0164e5b65aaa99db5f616e340a6da8e3c01fd5a07c8e4c727019f74760ca581552074e9f1a0237d35e",
@@ -31,14 +31,14 @@
         "lib\/Db\/PreferenceMapper.php": "4697ffe43030475d9091c3ce56936a7435533186f1ced6bebe3f07bbb47e8a59fa00758f77d2d27b8c13ed766d647450d7709e7b174c4da6e7bb0115e5c44988",
         "lib\/Db\/ReaderEntity.php": "cb76626c5c4f2d177756093ef7f836c5365724c4ff8906a57056bbc85563ddc91118faf5efa0cb295a9e533680d38bf51cdf78ec2dc25bd7a4f0737457e0cfdd",
         "lib\/Db\/ReaderMapper.php": "c8d44cefe4c1b3de1e55e71367c7d7e07630adbfd29027d29e06a4f04559c7ea869ccc28c862af439dd35042f8bbf7019cb5cab9bbd47c616ea99e28d222326d",
-        "lib\/Hooks.php": "5d322f3c09851b7411cab7ef2840060378f24cd637858cf05268ab9940395a0bd59c068cad93009996ec2da2c02f2ada746637c76498658be7957ea309647fb4",
+        "lib\/Hooks.php": "5d894611556a0da57bb33cd889c8998ccf182241d38f770a97cf52bb8ffbd6a00f91ad317e4ab0397810d4c7a92aa36a9e971d53c5c2ebff016dd4cda6457541",
         "lib\/Service\/BookmarkService.php": "7df012686e8d1e9a4668738d82edc51ca0da8e584767737091053bb48bcb896f11b03262f5e20dcd030a65af9c524d24003b3405679fbc23f60d0bb5d84eba15",
         "lib\/Service\/MetadataService.php": "7bc4ab9cdd16ced31f46ba137fa1efb4d6ef4784f947886e8affe667bf7b51c532bdc079e9033e774db4ea30a8da1000df958fc6e15e518bd920995dccc729cf",
         "lib\/Service\/PreferenceService.php": "2b52a28a074eba355154cbdad80358aaac394635ca91698ec3d7876eee0dc7e154064d8fbbe5465e7bbc783e618fbbf9ea1f07acd3cc4ce5b84116f7d8aed81c",
         "lib\/Service\/Service.php": "cdf97b612fde0bec7846c0005280f1492d63e705b753c4aeb1df2c2ad2612a122d49eb15b6e7dfbe7fd7320762171a6ac6324181511dc28ec0e1e27092872eae",
         "lib\/Utility\/Time.php": "58f760099eaf647718b491a7c21012398906bbe3ac7363aeceffff1a98d952f9a76697ddff2c00abe25e6c8db1cdf4d5994c1ab7d9474a05afb76b444ab9fed6",
         "lib\/config.php": "f9f15e0cddfea124ce2f094034dba422b4a6c45395ea23512dfa0949d4fac94c2adff6e7fbeacab15fa978522f2f2c903b0c80fd3fa5d0301f130908290c1574",
-        "personal.php": "915e052965637473534087919049f7d7c57d33142aac102dd93d78efde546aad4208f781bc879088f7896f3c6457b1e63f919c7348920c237adba1fa0553d3f5",
+        "personal.php": "9150fcce3c8215a76e1ef83e4092fb068e7ab663abc1aab0038c54e6cb480fffb458c82122292050f6bffdf2f0a7ac6706ed35449979b86d5425db22372f9ad9",
         "templates\/cbreader.php": "7ab62f3620c7e389aba6912b0729bbd0cb630aba1e5cbff4887497be3d51f9d8f35eeb748bb69684b65a8658a608a3f72353aa2212a92ad09664e9a87e2369ea",
         "templates\/epubreader.php": "dea28a9329414876f2660bff99d8f694c78967498991600e88054c1f11b285e8c1235cc472b5fbe1ea95c80a142cbc2373a10102776124d19361beff1ed4431b",
         "templates\/pdfreader.php": "16726d4eba75d85839e1c09a8842fba07869d1666a33d95511ed718727aed38de11004b017b878b0bbc5a9481e01454121bb24ddf4b1497022939fc575aa1af4",
@@ -132,6 +132,6 @@
         "vendor\/pixastic\/pixastic_combined.js": "a69bff7c76e6cdce7de3184184114e10f2ddcb369a2de03b1986c9a74d71f67f038d452d60df4a638e12420314bdc5c052a791a98d22ae5347a5f43bffd8b2f2",
         "vendor\/sindresorhus\/screenfull.js": "29d23b28b76827f037265ce60ef5cf76c0d560c7aece03593021feae9f6220c3170abf5a8b5f380885fe15e9204425fb5446fef61c3b0ca83d6f332eb1bd1571"
     },
-    "signature": "HmK7B0udcscYSFlXp9FADiGfIqHmv+wR2OejbSxR\/nFpeRu82tu\/CwFUExB4WJC1zP615s26FQi9LzlvNy56xXqOKrsiQBfnEp5NGXyXSUC6\/F2WvawzxyfX3VOuxZWcHTDflC4JpReUH8BDcmx8BLjQCx3V4zKyU+ME\/TCYUv2RDDC3Hsl7H8O39i5j1D0+ZmFRnMUSPEpl93wSRt33TC7fPP0aDDhF88+KAelrsMSoPYE572w6tG\/K3fWTTQ7yOnOjwezHoiqKKzdhk5FrkZuHN3s5a+76L94o39fw9vbYe3wXgazDeh\/lPUF9744kGYnvK3ohqBrvtcc2uwkWa\/iaZuh34njPF\/kte69miJLv57HspWimMFUPI1PkVwy9GSfB6o1bLYOzSgNbUBfbADaySCITT1pju1l0y3h1ofOvnxmaRNnmPpn\/TdI61vLAAnlKv\/Q4XRgp1I3LtSyncTuAkGkrslwmeGAQ5VdkdYpwdxmPrhiNeIr9mpRLUwEb6Y8H8KIiynQVcRYHJI6EeSKb2SyzzLjTjlIn61A75Y+BB6xOYNyB3E5VXnx5WosUED26EoTeueqxEmPDivUbJBwBLlLRegKf0sew62XDhrMDxh6H7IY0NY647BFwBBUBjQ\/ClKNo\/WDHj+Y9NyHgV5mUCoWZv54LJgUA9y1RPDw=",
+    "signature": "LWVth2WjzZPSomVtn9IiEMw0\/uxbN610xDKcM06RBSgNlLt998IsWmUoDo0DjJC5IjzZruoVuiEN3gGOWPGBbGWNji4PNDSxPc1m5HA3OGB32vjGDrqcQnyVStFOwE\/bM4h2Zr6oA5Jb5HnsWl\/JgiAUZTGaJu52RIprG0niwcYw8eyuMV3xciVgKSGx8oI4RUJb\/FCIDp+1jmwgRtcCIXqnb4TA\/5qv6KlMhJUnriwkCttG9avUiCCQI0+rmFOcnvh+XRDiWk7rR3+K8TIfQWCh2fWo\/AiQvacWUkVq\/o1ex2SRByFJ4cR0axhu5h3z\/K6kfWsdBFqiuXT6P7wsN3LDZMvFicb++D2LxZ4568T0\/dIZXiyHTSnVoaXbAvMs3n0jBpHitZgUsTqi0StJxravSaD+5sobUHt8D5qlZizbKBsxBJ7X5ospkKNHMnKB+16f64qe6VstscNt7WIXHuLYqgpaX3vbA+wp4xGl5f0aPFnBYZX1xOqh14X21691dd5SYCcRuTl8wR8m9JJAPmOcXVCTAMmAMcg+dtcgcaOBWfkVorkLzciYFnmqRQvX8WqL9BHtZzru3zdvpQ9fAsU8kx1jpieJosrOSz8WEdefmsY8KAkXI3NsNGZR3gsU99P30kcXiqpZN3NU1c1PDQwbFGCPJmdQlX7efdUdmeY=",
     "certificate": "-----BEGIN CERTIFICATE-----\r\nMIIE+TCCAuECAhBPMA0GCSqGSIb3DQEBCwUAMG0xCzAJBgNVBAYTAlVTMQ8wDQYD\r\nVQQIDAZCb3N0b24xFjAUBgNVBAoMDW93bkNsb3VkIEluYy4xNTAzBgNVBAMMLG93\r\nbkNsb3VkIENvZGUgU2lnbmluZyBJbnRlcm1lZGlhdGUgQXV0aG9yaXR5MB4XDTE4\r\nMDExODIxMzMyNFoXDTI4MDExNjIxMzMyNFowFzEVMBMGA1UEAwwMZmlsZXNfcmVh\r\nZGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2Dro3KQnJEnKeJVG\r\nnhKvrQSzLNyphcF5UNj4j3Km6wLcb86RkWtq6uX5eR6g0HI9NFZF3qxBLUGN8bpM\r\ngGyalTLwj5IsDYO\/naSZe\/wXNCBl82vZq+jjnDCYll7r2yNjTFVzRtH+o9AIQlmM\r\npt8+PCcw8n8QqlXUIq9A3kb8wggczEZnw6bCudDLQWXHYKD5\/tn7n06h9fA4VxfB\r\nQMyuv8hIjKEQqun3Qqvi3DfaR52sbeDvv9bGACxWqjiE3P6sZvL7MlDqJ5KeqWoM\r\n4qPGkgDusTtXuO7h3ro2H4NMydWXcrbUAPTXcAPo2jzTfhV8m9xQDc+45VlONjIp\r\nTFwV1oF53hnu81TlNniz1RTbDYMkExvPYtobNjNIR+VsOQs8Gq9iEDEIxyqCm2it\r\ncuMjeFhYr1rjyeS21i6cNtD\/kMxSFwKnluQPrb49pK6g2Nq5Go1iP8WgT12hAQhr\r\ni7wwH32bLe11xnD53ko6pAzhqmciaSHLxkZCm+eyTNwJzQa0uQ+gAD8gJ7bVQUxg\r\nPSjm1amfhMAzsHIraMFqzlz7IWjWA7vJGkR9DcweYBXsyt6ZloLekPsNxEKnuh3F\r\ngjBHEoy7iPLmDxGvTfPW76r6vBwBF9JgIrhJzRMtTHTsYX9olblQr957SLyiZaqJ\r\n\/kKCQZ3cKPhWBh1KydMjPlXbGFUCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAcYdp\r\ntoKFBZV7rswQ9yL6Y8F\/\/VUM1J1jincG3soCz5\/n5rL0TDekS0FI8eNWX0tay0ne\r\n3\/FZ93\/fb+gkQf7KutU\/9EWZwnc90XNq+Q3\/3DWz+nIm3EFttz6GioVYz7XEAx3A\r\nSMWeWY05ei9V7SVSnqglhouhLENrKKI8ilzGI\/pEtCs3RUv3xi7GPBdCDnvqqeXy\r\nRHrP7ZFe3v1go84v1MwQOt4\/OtaYk\/4HU51oxzUI8yDMNtLNmZm7gqLbT9bRsWCz\r\n5gqFa15K4X7sVL\/ECI72zEDZsF0RtmTCp9fJLoYXIPPQ1CACi0K0hB\/ssE6BC9Zl\r\naUXcbZ2BLwvQiZmEUhyyr0WYK4D\/dE4LbYqYpDDGRhXpf4cRhQahsYL8aMzZtZfl\r\nNDE4PN\/4sV6id6MnwrtDmsW3frMlkhzrsm8ftzwkbIyJD1Io5OAOJn6oxN2sjlWD\r\ngof0tuweAlTGuAI7\/CUA2yMZb45MFkLWDExzZsiVy9UtU641cDzOxAbg7UIeTBRZ\r\nYUdl5ci1f8299Yridc4n70yQg2GHwa8YJ6p42f93sTOo0E1UAX1+eBmuAmc\/eBq0\r\nFjjmMyPZy7EhElAUa2sqw5QS2\/AK34P0rccCaJerRJ0mU54neL5qSEuuPQnVcn\/\/\r\n3LGndYF8t5kHI3iXV3TJ2vyagUkWeDl6z9pyW0Y=\r\n-----END CERTIFICATE-----"
 }

files_reader/lib/Hooks.php

@@ -34,11 +34,14 @@ class Hooks {
     }
 
     public static function announce_settings(array $settings) {
-        $array = json_decode($settings['array']['oc_appconfig'], true);
+        // Nextcloud encodes this as JSON, Owncloud does not (yet) (#75)
+        // TODO: rmeove this when Owncloud starts encoding oc_appconfig as JSON just like it already encodes most other properties
+        $isJson = self::isJson($settings['array']['oc_appconfig']);
+        $array = ($isJson) ? json_decode($settings['array']['oc_appconfig'], true) : $settings['array']['oc_appconfig'];
         $array['filesReader']['enableEpub'] = Config::get('epub_enable', 'true');
         $array['filesReader']['enablePdf'] = Config::get('pdf_enable', 'true');
         $array['filesReader']['enableCbx'] = Config::get('cbx_enable', 'true');
-        $settings['array']['oc_appconfig'] = json_encode($array);
+        $settings['array']['oc_appconfig'] = ($isJson) ? json_encode($array) : $array;
     }
 
     protected static function deleteFile(IDBConnection $connection, $fileId) {
@@ -61,4 +64,7 @@ class Hooks {
         $queryBuilder->execute();
     }
 
+    private static function isJson($string) {
+        return is_string($string) && is_array(json_decode($string, true)) && (json_last_error() == JSON_ERROR_NONE) ? true : false;
+    }
 }

files_reader/personal.php

@@ -15,9 +15,9 @@ use OCP\Util;
 #$l = \OC::$server->getL10N('files_reader');
 
 $tmpl = new \OCP\Template('files_reader', 'settings-personal');
-$EpubEnable = Config::get('epub_enable', true);
-$PdfEnable = Config::get('pdf_enable', true);
-$CbxEnable = Config::get('cbx_enable', true);
+$EpubEnable = Config::get('epub_enable', 'true');
+$PdfEnable = Config::get('pdf_enable', 'true');
+$CbxEnable = Config::get('cbx_enable', 'true');
 $tmpl->assign('EpubEnable', $EpubEnable);
 $tmpl->assign('PdfEnable', $PdfEnable);
 $tmpl->assign('CbxEnable', $CbxEnable);