diff --git a/includes/alerts/transport.clickatell.php b/includes/alerts/transport.clickatell.php index 7dc9e87be0..34c235e8ae 100644 --- a/includes/alerts/transport.clickatell.php +++ b/includes/alerts/transport.clickatell.php @@ -21,14 +21,11 @@ * @subpackage Alerts */ -$data = array("api_id" => $opts['api_id'], "user" => $opts['user'], "password" => $opts['password'], "to" => implode(',',$opts['to']), "text" => $obj['title']); -if (!empty($opts['from'])) { - $data['from'] = $opts['from']; -} -$url = 'https://api.clickatell.com/http/sendmsg?'.http_build_query($data); +$url = 'https://platform.clickatell.com/messages/http/send?apiKey='.$opts['token'].'&to='.implode(',',$opts['to']).'&content='.urlencode($obj['title']); + $curl = curl_init($url); set_curl_proxy($curl); -curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "POST"); +curl_setopt($curl, CURLOPT_CUSTOMREQUEST, "GET"); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); $ret = curl_exec($curl); diff --git a/misc/db_schema.yaml b/misc/db_schema.yaml index b8dc54b1b1..c5e4a0e200 100644 --- a/misc/db_schema.yaml +++ b/misc/db_schema.yaml @@ -351,12 +351,12 @@ config: config_descr: { Field: config_descr, Type: varchar(100), 'Null': false, Default: 'NULL', Extra: '' } config_disabled: { Field: config_disabled, Type: 'enum(''0'',''1'')', 'Null': false, Default: '0', Extra: '' } config_group: { Field: config_group, Type: varchar(50), 'Null': false, Default: 'NULL', Extra: '' } - config_group_order: { Field: config_group_order, Type: int(11), 'Null': false, Default: 'NULL', Extra: '' } + config_group_order: { Field: config_group_order, Type: int(11), 'Null': false, Default: '0', Extra: '' } config_hidden: { Field: config_hidden, Type: 'enum(''0'',''1'')', 'Null': false, Default: '0', Extra: '' } config_id: { Field: config_id, Type: int(11), 'Null': false, Default: 'NULL', Extra: auto_increment } config_name: { Field: config_name, Type: varchar(255), 'Null': false, Default: 'NULL', Extra: '' } config_sub_group: { Field: config_sub_group, Type: varchar(50), 'Null': false, Default: 'NULL', Extra: '' } - config_sub_group_order: { Field: config_sub_group_order, Type: int(11), 'Null': false, Default: 'NULL', Extra: '' } + config_sub_group_order: { Field: config_sub_group_order, Type: int(11), 'Null': false, Default: '0', Extra: '' } config_value: { Field: config_value, Type: varchar(512), 'Null': false, Default: 'NULL', Extra: '' } Indexes: PRIMARY: { Name: PRIMARY, Columns: [config_id], Unique: true, Type: BTREE } diff --git a/sql-schema/211.sql b/sql-schema/211.sql new file mode 100644 index 0000000000..bccdea064d --- /dev/null +++ b/sql-schema/211.sql @@ -0,0 +1,2 @@ +ALTER TABLE `config` CHANGE `config_group_order` `config_group_order` INT(11) NOT NULL DEFAULT 0; +ALTER TABLE `config` CHANGE `config_sub_group_order` `config_sub_group_order` INT(11) NOT NULL DEFAULT 0; \ No newline at end of file