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

Commit 24596ac2 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

adding CardNumber CardSlot IccID DeviceName CarrierName Sent fields

parent 41f79f8b

appinfo/database.xml

+42 −0
Original line number Diff line number Diff line
@@ -98,6 +98,48 @@ 
				<default>00</default>

				<length>2</length>

			</field>

			<field>

				<name>sms_card_number</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>15</length>

			</field>

			<field>

				<name>sms_card_slot</name>

				<type>integer</type>

				<notnull>true</notnull>

				<default>-1</default>

				<length>2</length>

			</field>

			<field>

				<name>sms_icc_id</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>20</length>

			</field>

			<field>

				<name>sms_device_name</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>20</length>

			</field>

			<field>

				<name>sms_carrier_name</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>20</length>

			</field>

			<field>

				<name>sms_sent</name>

				<type>integer</type>

				<notnull>true</notnull>

				<default>1</default>

				<length>1</length>

			</field>

			<field>

				<name>sms_mailbox</name>

				<type>integer</type>

appinfo/info.xml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    <description>An app to sync SMS with your cloud</description>

    <licence>agpl</licence>

    <author>Loic Blot</author>

    <version>2.1.6</version>

    <version>2.1.7</version>

    <category>multimedia</category>

    <category>tools</category>

    <dependencies>

db/smsmapper.php

+22 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ class SmsMapper extends Mapper { 


		foreach ($phlst as $pn => $val) {

			$qb = $this->db->getQueryBuilder();

			$qb->select('sms_date', 'sms_msg', 'sms_type')

			$qb->select('sms_date', 'sms_msg', 'sms_type', 'sms_sent', 'sms_card_number', 'sms_card_slot', 'sms_icc_id', 'sms_device_name', 'sms_carrier_name')

				->from('ocsms_smsdatas')

				->where($qb->expr()->andX(

					$qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),
@@ -168,6 +168,12 @@ class SmsMapper extends Mapper { 
			while ($row = $result->fetch()) {

				$messageList[$row["sms_date"]] = array(

					"msg" =>  $row["sms_msg"],

					"sent" =>  $row["sms_sent"],

					"card_number" =>  $row["sms_card_number"],

					"card_slot" =>  $row["sms_card_slot"],

					"icc_id" =>  $row["sms_icc_id"],

					"device_name" =>  $row["sms_device_name"],

					"carrier_name" =>  $row["sms_carrier_name"],

					"type" => $row["sms_type"]

				);

			}
@@ -194,7 +200,7 @@ class SmsMapper extends Mapper { 
		$messageList = array();



		$qb = $this->db->getQueryBuilder();

		$qb->select('sms_address', 'sms_date', 'sms_msg', 'sms_type', 'sms_mailbox')

		$qb->select('sms_address', 'sms_date', 'sms_msg', 'sms_type', 'sms_mailbox', 'sms_card_number', 'sms_card_slot', 'sms_icc_id', 'sms_device_name', 'sms_carrier_name')

			->from('ocsms_smsdatas')

			->where($qb->expr()->andX(

				$qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),
@@ -210,6 +216,12 @@ class SmsMapper extends Mapper { 
				"address" => $row["sms_address"],

				"mailbox" => intval($row["sms_mailbox"]),

				"msg" => $row["sms_msg"],

				"sent" =>  $row["sms_sent"],

				"card_number" =>  $row["sms_card_number"],

				"card_slot" =>  $row["sms_card_slot"],

				"icc_id" =>  $row["sms_icc_id"],

				"device_name" =>  $row["sms_device_name"],

				"carrier_name" =>  $row["sms_carrier_name"],

				"type" => intval($row["sms_type"])

			);

		}
@@ -366,7 +378,8 @@ class SmsMapper extends Mapper { 
				$qb->delete('ocsms_smsdatas')

					->where($qb->expr()->andX(

						$qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),

						$qb->expr()->eq('sms_id', $qb->createNamedParameter((int) $sms["_id"]))

						$qb->expr()->eq('sms_id', $qb->createNamedParameter((int) $sms["_id"])),

						$qb->expr()->neq('sms_id', '-1')

					)

				);

				$qb->execute();
@@ -381,6 +394,12 @@ class SmsMapper extends Mapper { 
					'sms_date' => $qb->createNamedParameter($sms["date"]),

					'sms_id' => $qb->createNamedParameter((int) $sms["_id"]),

					'sms_address' => $qb->createNamedParameter($sms["address"]),

					'sms_card_number' => $qb->createNamedParameter($sms["card_number"]),

					'sms_card_slot' => $qb->createNamedParameter($sms["card_slot"]),

					'sms_icc_id' => $qb->createNamedParameter($sms["icc_id"]),

					'sms_device_name' => $qb->createNamedParameter($sms["device_name"]),

					'sms_carrier_name' => $qb->createNamedParameter($sms["carrier_name"]),

					'sms_sent' => $qb->createNamedParameter($sms["sent"]),

					'sms_msg' => $qb->createNamedParameter($sms["body"]),

					'sms_mailbox' => $qb->createNamedParameter((int) $sms["mbox"]),

					'sms_type' => $qb->createNamedParameter((int) $sms["type"])