PHP lint, compatibility check with php 7, README

.gitignore

@@ -0,0 +1 @@
+config.my.php

README.md

@@ -0,0 +1,6 @@
+## Getting Started
+
+Test the incoming calls script.
+```
+$ cat test.txt | php incoming.php
+```

agi.php

@@ -1,21 +1,22 @@
 <?php
 
-class Agi
+class Agi {
-{
+	private static $initialized = false;
-	private static $initialized = FALSE;
+	private static $agivars = [];
-	private static $agivars = array ();
 
-	static function init ()
+	/**
-	{
+	 * Initializes the AGI class, must be called once when the
+	 * application starts.
+	 */
+	static function init() {
 		if (self::$initialized)
 			return;
 
-		self::$initialized = TRUE;	
+		self::$initialized = true;	
 		pcntl_signal(SIGHUP, SIG_IGN);
 		pcntl_signal(SIGTERM, SIG_IGN);
 
-		while (!feof (STDIN))
+		while (!feof(STDIN)) {
-		{
 			$agivar = trim(fgets(STDIN, 4096));
 
 			if ($agivar === '')
@@ -28,16 +29,27 @@ class Agi
 		}
 	}
 	
-	static function get ($agivar)
+	/**
-	{
+	 * Returns the value for an AGI variable.
+	 * 
+	 * @param string $agivar The variable name
+	 * @return string The variable value
+	 */
+	static function get($agivar) {
 		if (self::$initialized && isset(self::$agivars[$agivar]))
 			return self::$agivars[$agivar];
 		else
-			return NULL;
+			return null;
 	}
 
-	static function exec ($cmd, &$result = NULL)
+	/**
-	{
+	 * Sends a command to the 
+	 * 
+	 * @param string $cmd The command
+	 * @param string $result The result string
+	 * @return int The command status
+	 */
+	static function exec($cmd, &$result = null) {
 		if (!self::$initialized)
 			return -1;
 	
@@ -46,10 +58,8 @@ class Agi
 
 		$res = trim(fgets(STDIN, 4096));
 
-		if (preg_match ("/^([0-9]{1,3}) (.*)/", $res, $matches))
+		if (preg_match("/^([0-9]{1,3})(.*)/", $res, $matches)) {
-		{
+			if (preg_match('/^result=([0-9\-]*)( ?\((.*)\))?$/', $matches[2], $match)) {		
-			if (preg_match ('/^result=([0-9\-]*)( ?\((.*)\))?$/', $matches[2], $match))
-			{		
 				$ret = (int) $match[1];
 				if ($num > 0)
 					$result = $match[3];
@@ -60,4 +70,3 @@ class Agi
 		return -1;
 	}
 }
-

config.php

@@ -4,12 +4,11 @@
  *
  * Do not modify this file! Instead, copy it to config.my.php and make
  * your changes there.
- **/
+ */
 return [
-
 	/**
 	 * Database parameters.
- **/
+	 */
 	'db' => [
 		'host'   => 'localhost'
 		,'port'   => 3306
@@ -17,6 +16,5 @@ return [
 		,'user'   => 'pbx'
 		,'pass'   => ''
 	]
-
 ];
 

copyright.txt

@@ -1,4 +1,4 @@
-Copyright (C) 2015 - Juan Ferrer Toribio
+Copyright (C) 2018 - Juan Ferrer Toribio
 
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

debian/changelog

@@ -1,4 +1,4 @@
-vn-asterisk (1.1.1) stable; urgency=low
+vn-asterisk (1.1.2) stable; urgency=low
 
   * Initial Release.
 

debian/control

@@ -4,8 +4,8 @@ Maintainer: Juan Ferrer Toribio <juan@verdnatura.es>
 Build-Depends: build-essential, debhelper
 Standards-Version: 3.9.3
 Section: misc
-Homepage: http://www.verdnatura.es
+Homepage: https://verdnatura.es/
-Vcs-Git: git://www.verdnatura.es/var/git/vn-asterisk
+Vcs-Git: http://git.verdnatura.es/vn-asterisk
  
 Package: vn-asterisk
 Architecture: all

debian/copyright

@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
 Name: vn-asterisk
-Source: git://www.verdnatura.es/var/git/
+Source: http://git.verdnatura.es/
 
 Files: *
 Copyright: 2011-2015 Juan Ferrer Toribio <juan@verdnatura.es>

debian/postinst

@@ -2,4 +2,3 @@
 
 #chown asterisk:asterisk /etc/asterisk/extensions.conf
 /etc/init.d/asterisk reload
-

debian/postrm

@@ -1,4 +1,3 @@
 #!/bin/bash
 
 /etc/init.d/asterisk reload
-

debian/rules

@@ -2,4 +2,3 @@
 
 %:
 	dh $@
-

env.php

@@ -4,7 +4,5 @@ require_once (__DIR__.'/../php-vn-lib/env.php');
 
 set_include_path(__DIR__.PATH_SEPARATOR.get_include_path());
 
-const _DEV_MODE = TRUE;
+const _DEV_MODE = true;
-const _CONFIG_DIR = __DIR__.'/../../.config';
 const _LOG_DIR = '/tmp';
-

incoming.php

@@ -1,8 +1,10 @@
 #!/usr/bin/php -q
 <?php
 
-require_once ('agi.php');
+if (file_exists(__DIR__.'/env.php'))
-@include_once __DIR__.'/env.php';
+	include_once __DIR__.'/env.php';
+
+require_once 'agi.php';
 require_once 'vn-autoload.php';
 
 $app = new Vn\Lib\App('vn-asterisk');
@@ -23,21 +25,19 @@ if (substr ($callerId, 0, $prefixLen) === $countryPrefix)
 
 // Checks if phone number is on the blacklist
 
-if ($db->getValue ('SELECT COUNT(*) > 0 FROM blacklist WHERE phone = #', [$callerId]))
+if ($db->getValue('SELECT COUNT(*) > 0 FROM blacklist WHERE phone = #', [$callerId])) {
-{
 	Agi::exec('HANGUP');
-	exit ();
+	exit;
 }
 
 // Checks whether its a festive day
 
 $sundayFestive = $db->getValue('SELECT sundayFestive FROM config');
 
-if (date ('N') == 7 && $sundayFestive)
+if (date('N') == 7 && $sundayFestive) {
-{
 	Agi::exec('SET VARIABLE MACRO playback');
 	Agi::exec('SET VARIABLE ARG1 out-of-ours');
-	exit ();
+	exit;
 }
 
 // Checks schedules
@@ -48,19 +48,17 @@ $hasSchedule = $db->getValue (
 		AND CURTIME() BETWEEN timeStart AND timeEnd'
 );
 
-if ($hasSchedule)
+if ($hasSchedule) {
-{
 	Agi::exec('SET VARIABLE MACRO queue');
 	Agi::exec('SET VARIABLE ARG1 1200');
-	exit ();
+	exit;
 }
 
 // Gets the customer from the phone number
 
 $customer = $db->getValue('SELECT clientFromPhone(#)', [$callerId]);
 
-if ($customer)
+if ($customer) {
-{
 	// Gets the customer salesperson extension
 
 	$extension = $db->getValue(
@@ -71,16 +69,11 @@ if ($customer)
 		,[$customer]
 	);
 
-	if ($extension)
+	if ($extension) {
-	{
 		Agi::exec('SET VARIABLE MACRO exten');
 		Agi::exec("SET VARIABLE ARG1 $extension");
-	}
+	} else {
-	else
-	{
 		Agi::exec('SET VARIABLE MACRO playback');
 		Agi::exec('SET VARIABLE ARG1 busy');
 	}
 }
-
-?>

sql/client-from-phone.sql

@@ -4,16 +4,15 @@
  * @param v_phone The caller phone number
  * @return The customer id or %NULL if customer not exists or is inactive
  **/
-USE pbx;
+DROP FUNCTION IF EXISTS pbx.clientFromPhone;
-DROP FUNCTION IF EXISTS customer_from_phone;
 DELIMITER $$
-CREATE FUNCTION customer_from_phone (v_phone VARCHAR(255))
+CREATE FUNCTION pbx.clientFromPhone (vPhone VARCHAR(255))
 	RETURNS INT
 	DETERMINISTIC
 BEGIN
-	DECLARE v_customer INT DEFAULT NULL;
+    DECLARE vClient INT DEFAULT NULL;
     
-	SET @phone = v_phone COLLATE 'utf8_unicode_ci';
+    -- SET vPhone = vPhone COLLATE 'utf8_unicode_ci';
     
     -- Searchs a customer associated to the phone number
 
@@ -22,21 +21,21 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT id_cliente customer
 			FROM vn2008.Clientes c
-			WHERE telefono = @phone
+			WHERE telefono = vPhone
-				OR movil = @phone
+				OR movil = vPhone
 		UNION
 		SELECT id_cliente
 			FROM vn2008.Consignatarios
-			WHERE telefono = @phone
+			WHERE telefono = vPhone
-				OR movil = @phone
+				OR movil = vPhone
 		UNION
 		SELECT r.id_cliente
 			FROM vn2008.Relaciones r
 				JOIN vn2008.Contactos c ON r.Id_Contacto = c.Id_Contacto
-			WHERE telefono = @phone
+			WHERE c.telefono = vPhone
-				OR movil = @phone;
+				OR c.movil = vPhone;
 
-	SELECT t.customer INTO v_customer
+	SELECT t.customer INTO vClient
 		FROM tmp.customer t
 			JOIN vn2008.Clientes c ON c.id_cliente = t.customer
 		WHERE c.activo
@@ -44,6 +43,6 @@ BEGIN
 
 	DROP TEMPORARY TABLE tmp.customer;
 
-	RETURN v_customer;
+	RETURN vClient;
 END$$
 DELIMITER ;

sql/extension-is-valid.sql

@@ -4,18 +4,17 @@
  * @param v_extension The extension to check format
  * @return %TRUE if it's well formated
  **/
-USE pbx;
+DROP PROCEDURE IF EXISTS pbx.extensionIsValid;
-DROP PROCEDURE IF EXISTS extension_is_valid;
 DELIMITER $$
-CREATE PROCEDURE extension_is_valid (v_extension VARCHAR(255))
+CREATE PROCEDURE pbx.extensionIsValid (vExtension VARCHAR(255))
 BEGIN
-	DECLARE v_is_valid BOOLEAN;
+	DECLARE vIsValid BOOLEAN;
 
-	SET v_is_valid =  v_extension IS NULL
+	SET vIsValid =  vExtension IS NULL
-		OR (v_extension REGEXP '^[0-9]{4}$'
+		OR (vExtension REGEXP '^[0-9]{4}$'
-		AND MOD(v_extension, 100) != 0);
+		AND MOD(vExtension, 100) != 0);
 
-	IF NOT v_is_valid
+	IF NOT vIsValid
 	THEN
 		SIGNAL SQLSTATE '45000'
 			SET MESSAGE_TEXT = 'EXTENSION_INVALID_FORMAT';

sql/phone-format.sql

@@ -0,0 +1,43 @@
+/**
+ * Reformats a phone number
+ *
+ * @param v_phone The phone to format
+ * @return The formated phone or %NULL if bad sintax
+ **/
+DROP FUNCTION IF EXISTS pbx.phoneFormat;
+DELIMITER $$
+CREATE FUNCTION pbx.phoneFormat (vPhone VARCHAR(255))
+RETURNS VARCHAR(255)
+DETERMINISTIC
+BEGIN
+	DECLARE vI INT DEFAULT 0;
+	DECLARE vChr VARCHAR(1);
+	DECLARE vLen INT DEFAULT LENGTH(vPhone);
+	DECLARE vNewPhone VARCHAR(255) DEFAULT '';
+
+	WHILE vI < vLen
+    DO
+		SET vChr = SUBSTR(vPhone, vI + 1, 1);
+    
+		IF vChr REGEXP '^[0-9]$'
+        THEN
+			SET vNewPhone = CONCAT(vNewPhone, vChr);
+		ELSEIF vChr = '+' AND vI = 0
+        THEN
+			SET vNewPhone = CONCAT(vNewPhone, '00');
+		END IF;
+        
+        SET vI = vI + 1;
+    END WHILE;
+
+	IF vNewPhone REGEXP '^0+$' OR vNewPhone = '' THEN
+		RETURN NULL;
+	END IF;
+
+	IF vNewPhone REGEXP '^0034' THEN
+		SET vNewPhone = SUBSTR(vNewPhone, 5);
+	END IF;
+
+	RETURN vNewPhone;
+END$$
+DELIMITER ;

sql/phone-is-valid.sql

@@ -0,0 +1,24 @@
+/**
+ * Checks whether a passed phone number has valid sintax
+ *
+ * @param v_phone The phone to check format
+ * @return %TRUE if it's well formated
+ **/
+DROP PROCEDURE IF EXISTS pbx.phoneIsValid;
+DELIMITER $$
+CREATE PROCEDURE pbx.phoneIsValid (vPhone VARCHAR(255))
+BEGIN
+	DECLARE vIsValid BOOLEAN;
+
+    SET vIsValid =  vPhone IS NULL
+		OR (vPhone REGEXP '^[0-9]+$'
+		AND vPhone NOT REGEXP '^0+$'
+		AND vPhone NOT REGEXP '^0034');
+
+	IF NOT vIsValid
+    THEN
+		SIGNAL SQLSTATE '45000'
+			SET MESSAGE_TEXT = 'PHONE_INVALID_FORMAT';
+    END IF;
+END$$
+DELIMITER ;

sql/phone_format.sql

@@ -1,44 +0,0 @@
-/**
- * Reformats a phone number
- *
- * @param v_phone The phone to format
- * @return The formated phone or %NULL if bad sintax
- **/
-USE pbx;
-DROP FUNCTION IF EXISTS phone_format;
-DELIMITER $$
-CREATE FUNCTION phone_format (phone VARCHAR(255))
-RETURNS VARCHAR(255)
-DETERMINISTIC
-BEGIN
-	DECLARE i INT DEFAULT 0;
-	DECLARE chr VARCHAR(1);
-	DECLARE len INT DEFAULT LENGTH(phone);
-	DECLARE newPhone VARCHAR(255) DEFAULT '';
-
-	WHILE i < len
-	DO
-		SET chr = SUBSTR(phone, i+1, 1);
-
-		IF chr REGEXP '^[0-9]$'
-		THEN
-			SET newPhone = CONCAT(newPhone, chr);
-		ELSEIF chr = '+' AND i = 0
-		THEN
-			SET newPhone = CONCAT(newPhone, '00');
-		END IF;
-
-		SET i = i + 1;
-	END WHILE;
-
-	IF newPhone REGEXP '^0+$' OR newPhone = '' THEN
-		RETURN NULL;
-	END IF;
-
-	IF newPhone REGEXP '^0034' THEN
-		SET newPhone = SUBSTR(newPhone, 5);
-	END IF;
-
-	RETURN newPhone;
-END$$
-DELIMITER ;

sql/phone_is_valid.sql

@@ -1,25 +0,0 @@
-/**
- * Checks whether a passed phone number has valid sintax
- *
- * @param v_phone The phone to check format
- * @return %TRUE if it's well formated
- **/
-USE pbx;
-DROP PROCEDURE IF EXISTS phone_is_valid;
-DELIMITER $$
-CREATE PROCEDURE phone_is_valid (v_phone VARCHAR(255))
-BEGIN
-	DECLARE v_is_valid BOOLEAN;
-
-	SET v_is_valid =  v_phone IS NULL
-		OR (v_phone REGEXP '^[0-9]+$'
-		AND v_phone NOT REGEXP '^0+$'
-		AND v_phone NOT REGEXP '^0034');
-
-	IF NOT v_is_valid
-	THEN
-		SIGNAL SQLSTATE '45000'
-			SET MESSAGE_TEXT = 'PHONE_INVALID_FORMAT';
-	END IF;
-END$$
-DELIMITER ;

sql/queue-is-valid.sql

@@ -4,17 +4,16 @@
  * @param v_queue The queue to check format
  * @return %TRUE if it's well formated
  **/
-USE pbx;
+DROP PROCEDURE IF EXISTS pbx.queueIsValid;
-DROP PROCEDURE IF EXISTS queue_is_valid;
 DELIMITER $$
-CREATE PROCEDURE queue_is_valid (v_queue VARCHAR(255))
+CREATE PROCEDURE pbx.queueIsValid (vQueue VARCHAR(255))
 BEGIN
-	DECLARE v_is_valid BOOLEAN;
+	DECLARE vIsValid BOOLEAN;
 
-	SET v_is_valid = v_queue IS NULL
+	SET vIsValid = vQueue IS NULL
-		OR v_queue REGEXP '^[1-9][0-9]00$';
+		OR vQueue REGEXP '^[1-9][0-9]00$';
 
-	IF NOT v_is_valid
+	IF NOT vIsValid
 	THEN
 		SIGNAL SQLSTATE '45000'
 			SET MESSAGE_TEXT = 'QUEUE_INVALID_FORMAT';

test.txt

@@ -1 +1 @@
-agi_callerid: +34626953640
+agi_callerid: +34963242100