Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fca47b4 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

renamming ocsms -> esms

parent f1940a18

254.patch

+7 −7
Original line number Diff line number Diff line
@@ -11424,7 +11424,7 @@ index f2542f06..d62199a5 100644 
+      let msgClass = '';

+      let msgCount = 0;

 			let self = this;

+			let twemojiOptions = { base: OC.generateUrl('/apps/ocsms/js/twemoji/')};

+			let twemojiOptions = { base: OC.generateUrl('/apps/esms/js/twemoji/')};

 

 			$.each(jsondata["conversation"], function (id, vals) {

 				if (vals["type"] == 1) {
@@ -107407,21 +107407,21 @@ index 2697b02a..56e5961d 100644 
--- a/templates/main.php

+++ b/templates/main.php

@@ -13,7 +13,7 @@

 \OCP\Util::addScript('ocsms', 'devel/conversation');

 \OCP\Util::addScript('ocsms', 'devel/helpers');

 \OCP\Util::addScript('ocsms', 'devel/notifications');

 \OCP\Util::addScript('esms', 'devel/conversation');

 \OCP\Util::addScript('esms', 'devel/helpers');

 \OCP\Util::addScript('esms', 'devel/notifications');

-

+\OCP\Util::addScript('ocsms', 'twemoji/twemoji.min');

+\OCP\Util::addScript('esms', 'twemoji/twemoji.min');

 ?>

 

 <script type="text/x-template" id="modal-template" xmlns:v-on="http://www.w3.org/1999/xhtml"

@@ -129,7 +129,7 @@

 			<div v-if="messages.length > 0" class="ocsms-messages-container">

 			<div v-if="messages.length > 0" class="esms-messages-container">

 				<div v-for="message in orderedMessages">

 					<div v-bind:class="['msg-'+  message.type]">

-						<div>{{ message.content }}</div>

+						<div v-html="message.content"></div>

 						<div style="display: block;" id="ocsms-message-removal" class="icon-delete svn delete action" v-on:click="removeConversationMessage(message.id);"></div>

 						<div style="display: block;" id="esms-message-removal" class="icon-delete svn delete action" v-on:click="removeConversationMessage(message.id);"></div>

 						<div class="msg-date">{{ message.date | date:'medium' }}</div>

 					</div>

























Dockerfile



+1
−1






























Original line number
Diff line number
Diff line









FROM nextcloud:15.0.0-rc-apache



















COPY . /usr/src/nextcloud/apps/ocsms








COPY . /usr/src/nextcloud/apps/esms
























README.md



+1
−1






























Original line number
Diff line number
Diff line







@@ -4,7 +4,7 @@ Phone Sync provides a webinterface to display your SMS conversations. SMS conver

















## :arrow_forward: Access



















The app is available on the [Nextcloud App Store](https://apps.nextcloud.com/apps/ocsms), so installing is as easy as:









The app is available on the [Nextcloud App Store](https://apps.nextcloud.com/apps/esms), so installing is as easy as:



















1. Navigate in your Nextcloud instance to the "Apps" 









2. Select the category "Multimedia"
































appinfo/app.php



+7
−7






























Original line number
Diff line number
Diff line







@@ -9,29 +9,29 @@







 * @copyright Loic Blot 2014-2017









 */



















namespace OCA\OcSms\AppInfo;









namespace OCA\ESms\AppInfo;



















if (class_exists('\OCP\AppFramework\App')) {









	\OC::$server->getNavigationManager()->add(array(









	    // the string under which your app will be referenced in owncloud









	    'id' => 'ocsms',









	    'id' => 'esms',



















	    // sorting weight for the navigation. The higher the number, the higher









	    // will it be listed in the navigation









	    'order' => 10,



















	    // the route that will be shown on startup









	    'href' => \OC::$server->getURLGenerator()->linkToRoute('ocsms.sms.index'),









	    'href' => \OC::$server->getURLGenerator()->linkToRoute('esms.sms.index'),



















	    // the icon that will be shown in the navigation









	    // this file needs to exist in img/









	    'icon' => \OC::$server->getURLGenerator()->imagePath('ocsms', 'app.svg'),









	    'icon' => \OC::$server->getURLGenerator()->imagePath('esms', 'app.svg'),



















	    // the title of your application. This will be used in the









	    // navigation or on the settings page of your app









	    'name' => \OCP\Util::getL10N('ocsms')->t('Phone Sync')









	    'name' => \OCP\Util::getL10N('esms')->t('Phone Sync')









	));









} else {









	$msg = 'Can not enable the OcSms app because the App Framework App is disabled';









	\OC::$server->getLogger()->error($msg, array('ocsms'));









	$msg = 'Can not enable the ESms app because the App Framework App is disabled';









	\OC::$server->getLogger()->error($msg, array('esms'));









}
























appinfo/database.xml



+13
−13






























Original line number
Diff line number
Diff line







@@ -6,7 +6,7 @@







	<charset>utf8</charset>



















	<table>









		<name>*dbprefix*ocsms_user_datas</name>









		<name>*dbprefix*esms_user_datas</name>









		<declaration>









			<field>









				<name>user_id</name>








@@ -27,7 +27,7 @@







				<notnull>true</notnull>









			</field>









			<index>









				<name>user_datas_user_datakey</name>









				<name>esms_user_datas_user_datakey</name>









				<field>









					<name>user_id</name>









				</field>








@@ -38,7 +38,7 @@







		</declaration>









	</table>









	<table>









		<name>*dbprefix*ocsms_smsdatas</name>









		<name>*dbprefix*esms_smsdatas</name>









		<declaration>









			<field>









				<name>id</name>








@@ -153,7 +153,7 @@







				<length>1</length>









			</field>









			<index>









				<name>smsdata_user_mailbox</name>









				<name>esms_smsdata_user_mailbox</name>









				<field>









					<name>user_id</name>









				</field>








@@ -162,7 +162,7 @@







				</field>









			</index>









			<index>









				<name>smsdata_user_smsid</name>









				<name>esms_smsdata_user_smsid</name>









				<field>









					<name>user_id</name>









				</field>








@@ -171,7 +171,7 @@







				</field>









			</index>









			<index>









				<name>smsdata_user_mailbox_date</name>









				<name>esms_smsdata_user_mailbox_date</name>









				<field>









					<name>user_id</name>









				</field>








@@ -183,7 +183,7 @@







				</field>









			</index>









			<index>









				<name>smsdata_user_mailbox_address</name>









				<name>esms_smsdata_user_mailbox_address</name>









				<field>









					<name>user_id</name>









				</field>








@@ -195,7 +195,7 @@







				</field>









			</index>









			<index>









				<name>smsdata_user_mailbox_address_date</name>









				<name>esms_smsdata_user_mailbox_address_date</name>









				<field>









					<name>user_id</name>









				</field>








@@ -212,7 +212,7 @@







		</declaration>









	</table>









	<table>









		<name>*dbprefix*ocsms_sendmessage_queue</name>









		<name>*dbprefix*esms_sendmessage_queue</name>









		<declaration>









			<field>









				<name>id</name>








@@ -244,7 +244,7 @@







		</declaration>









	</table>









	<table>









		<name>*dbprefix*ocsms_conversation_read_states</name>









		<name>*dbprefix*esms_conversation_read_states</name>









		<declaration>









			<field>









				<name>user_id</name>








@@ -265,7 +265,7 @@







				<notnull>true</notnull>









			</field>









			<index>









				<name>sms_conversation_rs_pkey</name>









				<name>esms_sms_conversation_rs_pkey</name>









				<field>









					<name>user_id</name>









				</field>








@@ -276,7 +276,7 @@







		</declaration>









	</table>









	<table>









        <name>*dbprefix*ocsms_config</name>









        <name>*dbprefix*esms_config</name>









        <declaration>









            <field>









                <name>user</name>








@@ -297,7 +297,7 @@







                <length>10240</length>









            </field>









			<index>









				<name>config_user_key</name>









				<name>esms_config_user_key</name>









				<field>









					<name>user</name>









				</field>