Merge pull request #8 from dkgroot/master

Updated install.php

install.php

@@ -1,7 +1,7 @@
 <?php
 
 if (!defined('FREEPBX_IS_AUTH')) {
-    die('No direct script access allowed');
+    die_freepbx('No direct script access allowed');
 }
 
 global $db;
@@ -9,7 +9,30 @@ global $amp_conf;
 global $astman;
 global $version;
 
-$db_config_v0 = array('sccpdevmodel' => array('enabled' => array('create' => "INT(2) NULL DEFAULT '0'"),
+//
+// Helper function to retrieve SCCPConfigMetaData via ASTMan
+// segment: ["", "general","device","line","softkey"]}
+// returns a php variable (array/set)
+//
+// Move to seperate helper file
+function astman_retrieveJSFromMetaData($astman, $segment = "") {
+    $params = array();
+    if ($segment != "") {
+        $params["Segment"] = $segment;
+    }
+    $response = $astman->send_request('SCCPConfigMetaData', $params);
+    if ($response["Response"] == "Success") {
+        //outn(_("JSON-content:").$response["JSON"]);
+        $decode=json_decode($response["JSON"], true);
+        return $decode;
+    } else {
+        return false;
+    }
+}
+
+$db_config_v0 = array(
+    'sccpdevmodel' => array(
+        'enabled' => array('create' => "INT(2) NULL DEFAULT '0'"),
         'nametemplate' => array('create' => 'VARCHAR(50) NULL DEFAULT NULL'),
         'loadinformationid' => array('create' => "VARCHAR(30) NULL DEFAULT NULL" )
     ),
@@ -41,7 +64,8 @@ $db_config_v0 = array('sccpdevmodel' => array('enabled' => array('create' => "IN
         'softkeyset' =>array('def_modify' => "softkeyset")
     ),
 
-                       'sccpline' => array('namedcallgroup' =>array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `setvar`", 'modify' => "VARCHAR(100)"),
+    'sccpline' => array(
+        'namedcallgroup' =>array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `setvar`", 'modify' => "VARCHAR(100)"),
         'namedpickupgroup' =>array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `namedcallgroup`", 'modify' => "VARCHAR(100)"),
         'adhocNumber' =>array('create' => "VARCHAR(45) NULL DEFAULT NULL AFTER `namedpickupgroup`"),
         'meetme' =>array('create' => "VARCHAR(5) NULL DEFAULT NULL AFTER `adhocNumber`"),
@@ -58,8 +82,9 @@ $db_config_v0 = array('sccpdevmodel' => array('enabled' => array('create' => "IN
     )
 );
 
-
+$db_config_v3 = array(
-$db_config_v3 = array('sccpdevmodel' => array('enabled' => array('create' => "INT(2) NULL DEFAULT '0'"),
+    'sccpdevmodel' => array(
+        'enabled' => array('create' => "INT(2) NULL DEFAULT '0'"),
         'nametemplate' => array('create' => 'VARCHAR(50) NULL DEFAULT NULL'),
         'loadinformationid' => array('create' => "VARCHAR(30) NULL DEFAULT NULL" )
     ),
@@ -101,7 +126,8 @@ $db_config_v3 = array('sccpdevmodel' => array('enabled' => array('create' => "IN
         'nat' =>array('def_modify' => "auto"),
         'softkeyset' =>array('def_modify' => "softkeyset")
     ),
-                       'sccpline' => array('namedcallgroup' =>array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `setvar`", 'modify' => "VARCHAR(100)"),
+    'sccpline' => array(
+        'namedcallgroup' =>array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `setvar`", 'modify' => "VARCHAR(100)"),
          'namedpickupgroup' =>array('create' => "VARCHAR(100) NULL DEFAULT NULL AFTER `namedcallgroup`", 'modify' => "VARCHAR(100)"),
          'adhocNumber' =>array('create' => "VARCHAR(45) NULL DEFAULT NULL AFTER `namedpickupgroup`"),
          'meetme' =>array('create' => "VARCHAR(5) NULL DEFAULT NULL AFTER `adhocNumber`"),
@@ -126,92 +152,131 @@ $db_config_v3 = array('sccpdevmodel' => array('enabled' => array('create' => "IN
 $autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT" : "AUTO_INCREMENT";
 
 $table_req = array('sccpdevice', 'sccpline', 'buttonconfig');
-
 $ss = FreePBX::create()->Sccp_manager;
+$astman = FreePBX::create()->astman;
+$sccp_ver = 0;
+$db_config = $db_config_v0;
 
-outn(_("checking for Sccp_manager database tables.."));
+function CheckSCCPManagerDBTables($table_req) {
+    global $db;
+    outn("<li>" . _("Checking for Sccp_manager database tables..") . "</li>");
     foreach ($table_req as $value) {
         $check = $db->getRow("SELECT 1 FROM `$value` LIMIT 0", DB_FETCHMODE_ASSOC);
         if (DB::IsError($check)) {
             //print_r("none, creating table :". $value);
-        out(_("none, Can't find table: " . $value));
+            outn(_("Can't find table: " . $value));
-        out(_("none, Please goto the chan-sccp/conf directory and create the DB schema (See wiki)"));
+            outn(_("Please goto the chan-sccp/conf directory and create the DB schema manually (See wiki)"));
-        die("!!!! Installation error: Can not find required ".$value." table !!!!!!\n");
+            die_freepbx("!!!! Installation error: Can not find required ".$value." table !!!!!!\n");
-//        die_freepbx("!!!! Instalation error. Can not find required ".$value." table !!!!!!\n");
+        }
     }
 }
 
-
+function CheckPermissions() {
-$version = FreePBX::Config()->get('ASTVERSION');
+    outn("<li>" . _("Checking Filesystem Permissions") . "</li>");
-outn(_("checking Version : ").$version);
-
     $dst = $_SERVER['DOCUMENT_ROOT'] . '/admin/modules/sccp_manager/views';
     if (fileowner($_SERVER['DOCUMENT_ROOT']) != fileowner($dst)){
-    die('Please (re-)check permissions by running "amportal chown"');
+        die_freepbx('Please (re-)check permissions by running "amportal chown. Installation Failed"');
+    }
 }
 
+function CheckAsteriskVersion() {
+    outn("<li>" . _("Checking Asterisk Version : ") . $version . "</li>");
+    $version = FreePBX::Config()->get('ASTVERSION');
     if (!empty($version)) {
         // Woo, we have a version
         if (version_compare($version, "12.2.0", ">=")) {
-        $ver_compatable = true;
+            $ver_compatible = true;
+        } else {
+            die_freepbx('Asterisk Version is to old, please upgrade to asterisk-12 or higher. Installation Failed');
         }
     } else {
         // Well. I don't know what version of Asterisk I'm running.
         // Assume less than 12.
-
+        $ver_compatible = false;
-    $ver_compatable = false;
+        die_freepbx('Asterisk Version could not be verified. Installation Failed');
-    die('Versin is not comapable');
+    }
+    return $ver_compatible;
 }
 
-// Should be replaced by a function to check the AMI:SCCPConfigMetaData
+function CheckChanSCCPVersion($astman) {
-// JSON: {"Name":"Chan-sccp-b","Branch":"issues/394_1","Version":"4.3.0","Revision":"8d9d74fM","ConfigRevision":"0","ConfigureEnabled": ["park","pickup","realtime","video","conferenence","dirtrfr","feature_monitor","functions","manager_events","devstate_feature","dynamic_speeddial","dynamic_speeddial_cid","experimental","debug"],"Segments":["general","device","line","softkey"]}
+    global $db_config, $db_config_v0, $db_config_v3;
-$ast_out = $astman->Command("sccp show version");
+    if (!$astman) {
+        ie_freepbx('No asterisk manager connection provided!. Installation Failed');
+    }
+    $metadata = astman_retrieveJSFromMetaData($astman, "");
+    // example metadata:
+    // {"Name":"Chan-sccp-b","Branch":"develop","Version":"4.3.0","RevisionHash":"d3f4482","RevisionNum":"10403","Tag":"v4.2.3-574-gd3f44824","VersioningType":"git","ConfigRevision":"0",
+    // "ConfigureEnabled": ["park","pickup","realtime","video","conferenence","dirtrfr","feature_monitor","functions","manager_events","devstate_feature","dynamic_speeddial","dynamic_speeddial_cid","experimental","debug"],
+    // "Segments":["general","device","line","softkey"]}
+    
+    if ($metadata && array_key_exists("Version",$metadata)) {
+        $version_parts=explode(".", $metadata["Version"]);
+        
+        # not sure about this sccp_ver numbering. Might be better to just check "Version" and Revision
+        if ($version_parts[0] == "4") {
+            $sccp_ver = 400;
             $db_config = $db_config_v0;
-if (preg_match("/Release.*\(/", $ast_out['data'] , $matches)) {
+            if ($version_parts[1] == "1") {
-    $ast_out = explode(' ', substr($matches[0],9,-1));
+                $sccp_ver = 410;
-    $sccp_ver = 0;
+            } else
-    if ($ast_out[0] >= '4.3.0'){
+            if ($version_parts[1] == "2") {
-        $sccp_ver = 1;
+                $sccp_ver = 420;
+            } else
+            if ($version_parts[1] >= "3") {
+                $sccp_ver = 430;
             }
-    if (!empty($ast_out[1]) && $ast_out[1] == 'develop'){           
+        }
-        $sccp_ver = 10;
+
-        if (!empty($ast_out[3])) {
+        /*
-            if (base_convert($ast_out[3],16,10) >= base_convert('702487a',16,10)){           
+        if (array_key_exists("Branch",$metadata)) {
-                $sccp_ver += 1;
+            if ($metadata["Branch"] == "master") {
+            
+            } else
+            if ($metadata["Branch"] == "develop") {
+            
+            }
+        }
+        */
+
+        /* Revision got replaced by RevisionHash in 10404 (using the hash does not work)*/
+        if (array_key_exists("Revision",$metadata) &&						// old method
+          (base_convert($metadata["Revision"],16,10) == base_convert('702487a',16,10))		// hash values are random, not incremental
+        ) {
+            $sccp_ver = 431;
+            $db_config = $db_config_v3;
+        } else 
+        if (array_key_exists("RevisionNum",$metadata) && $metadata["RevisionNum"] >= "10403") {	// new method, RevisionNum is incremental
+            $sccp_ver = 432;
             $db_config = $db_config_v3;
         }
-        }
     } else {
-       $sccp_ver = 0;
+        die_freepbx("Version information could not be retrieved from chan-sccp, via astman::SCCPConfigMetaData");
     }
+    outn("<li>" . _("Sccp Version : ") . $sccp_ver . "</li>");
+    return $sccp_ver;
 }
 
-
+function InstallDB_sccpsettings() {
-
+    global $db;
-// test
+    outn("<li>" . _("Creating sccpsettings table...") . "</li>");
-//    $sccp_ver = 0;
+    $sql = "CREATE TABLE IF NOT EXISTS `sccpsettings` (
-//    $db_config = $db_config_v0;
-// test
-    outn(_(" Sccp Version : ").$sccp_ver);
-
-$sql = <<< END
-    CREATE TABLE IF NOT EXISTS `sccpsettings` (
             `keyword` VARCHAR (50) NOT NULL default '',
             `data`    VARCHAR (255) NOT NULL default '',
             `seq`     TINYINT (1),
             `type`    TINYINT (1) NOT NULL default '0',
             PRIMARY KEY (`keyword`,`seq`,`type`)
-    )
+    );";
-END;
-
-    out(_("No sccpsettings table, creating table"));
     $check = $db->query($sql);
     if (db::IsError($check)) {
         die_freepbx("Can not create sccpsettings table, error:$check\n");
     }
+    return true;
+}
 
-$sql = <<< END
+function InstallDB_sccpdevmodel() {
-    CREATE TABLE IF NOT EXISTS `sccpdevmodel` (
+    global $db;
+    outn("<li>" . _("Creating sccpdevmodel table...") . "</li>");
+    $sql = "CREATE TABLE IF NOT EXISTS `sccpdevmodel` (
         `model` varchar(20) NOT NULL DEFAULT '',
         `vendor` varchar(40) DEFAULT '',
         `dns` int(2) DEFAULT '1',
@@ -222,15 +287,20 @@ $sql = <<< END
         `nametemplate` VARCHAR(50) NULL DEFAULT NULL,
         PRIMARY KEY (`model`),
         KEY `model` (`model`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1
+    ) ENGINE=MyISAM DEFAULT CHARSET=latin1;";
-END;
-
     $check = $db->query($sql);
     if (db::IsError($check)) {
         die_freepbx("Can not create sccpdevmodel table, error:$check\n");
     }
-    out(_("none, Modify DB schama"));
+    return true;
+}
 
+function InstallDB_updateSchema($db_config) {
+    global $db;
+    if (!$db_config) {
+        die_freepbx("No db_config provided");
+    }
+    outn("<li>" . _("Modify Database schema") . "</li>");
     foreach ($db_config as $tabl_name => &$tab_modify) {
         // 0 - name 1-type  4- default
         $sql = "DESCRIBE ".$tabl_name."";
@@ -309,10 +379,12 @@ $check = $db->query($sql);
             }
         }
     }
+    return true;
+}
 
-    out(_("none, Uptade Table Info"));
+function InstallDB_fillsccpdevmodel() {
-
+    global $db;
-//$sql = "REPLACE INTO `sccpdevmodel` VALUES ('7925','CISCO',1,1,'',''),('7902','CISCO',1,1,'CP7902080002SCCP060817A','loadInformation30008'),('7905','CISCO',1,1,'CP7905080003SCCP070409A','loadInformation20000'),('7906','CISCO',1,1,'SCCP11.8-3-1S','loadInformation369'),('7910','CISCO',1,1,'P00405000700','loadInformation6'),('7911','CISCO',1,1,'SCCP11.8-3-1S','loadInformation307'),('7912','CISCO',1,1,'CP7912080003SCCP070409A','loadInformation30007'),('7914','CISCO',0,14,'S00105000300','loadInformation124'),('7920','CISCO',1,1,'cmterm_7920.4.0-03-02','loadInformation30002'),('7921','CISCO',1,1,'CP7921G-1.0.3','loadInformation365'),('7931','CISCO',1,1,'SCCP31.8-3-1S','loadInformation348'),('7936','CISCO',1,1,'cmterm_7936.3-3-13-0','loadInformation30019'),('7937','CISCO',1,1,'','loadInformation431'),('7940','CISCO',1,2,'P00308000500','loadInformation8'),('Digital Access+','CISCO',1,1,'D00303010033','loadInformation42'),('7941','CISCO',1,2,'P00308000500','loadInformation115'),('7941G-GE','CISCO',1,2,'P00308000500','loadInformation309'),('7942','CISCO',1,2,'P00308000500','loadInformation434'),('Digital Access','CISCO',1,1,'D001M022','loadInformation40'),('7945','CISCO',1,2,'P00308000500','loadInformation435'),('7960','CISCO',3,6,'P00308000500','loadInformation7'),('7961','CISCO',3,6,'P00308000500','loadInformation30018'),('7961G-GE','CISCO',3,6,'P00308000500','loadInformation308'),('7962','CISCO',3,6,'P00308000500','loadInformation404'),('7965','CISCO',3,6,'P00308000500','loadInformation436'),('7970','CISCO',3,8,'SCCP70.8-3-1S','loadInformation30006'),('7971','CISCO',3,8,'SCCP70.8-3-1S','loadInformation119'),('7975','CISCO',3,8,'SCCP70.8-3-1S','loadInformation437'),('7985','CISCO',3,8,'cmterm_7985.4-1-4-0','loadInformation302'),('ATA 186','CISCO',1,1,'ATA030203SCCP051201A','loadInformation12'),('IP Communicator','CISCO',1,1,'','loadInformation30016'),('12 SP','CISCO',1,1,'','loadInformation3'),('12 SP+','CISCO',1,1,'','loadInformation2'),('30 SP+','CISCO',1,1,'','loadInformation1'),('30 VIP','CISCO',1,1,'','loadInformation5'),('7914,7914','CISCO',0,28,'S00105000300','loadInformation124'),('7915','CISCO',0,14,'',''),('7916','CISCO',0,14,'',''),('7915,7915','CISCO',0,28,'',''),('7916,7916','CISCO',0,28,'',''),('CN622','MOTOROLA',1,1,'','loadInformation335'),('ICC','NOKIA',1,1,'',''),('E-Series','NOKIA',1,1,'',''),('3911','CISCO',1,1,'','loadInformation446'),('3951','CISCO',1,1,'','loadInformation412');";
+    outn("<li>" . _("Fill sccpdevmodel") . "</li>");
     $sql = "REPLACE INTO `sccpdevmodel` (`model`, `vendor`, `dns`, `buttons`, `loadimage`, `loadinformationid`, `enabled`, `nametemplate`) VALUES ('12 SP', 'CISCO', 1, 1, '', 'loadInformation3', 0, NULL)," .
                 "('12 SP+', 'CISCO', 1, 1, '', 'loadInformation2', 0, NULL), ('30 SP+', 'CISCO', 1, 1, '', 'loadInformation1', 0, NULL), ('30 VIP', 'CISCO', 1, 1, '', 'loadInformation5', 0, NULL), ('3911', 'CISCO', 1, 1, '', 'loadInformation446', 0, NULL), ('3951', 'CISCO', 1, 1, '', 'loadInformation412', 0, ''), ('6901', 'CISCO', 1, 0, 'SCCP6901.9-2-1-a', 'loadInformation547', 0, NULL), ('6911', 'CISCO', 1, 0, 'SCCP6911.9-2-1-a', 'loadInformation548', 0, NULL), ('6921', 'CISCO', 1, 0, 'SCCP69xx.9-2-1-0', 'loadInformation496', 0, NULL), ('6941', 'CISCO', 1, 1, 'SCCP69xx.9-2-1-0', 'loadInformation495', 0, NULL), ('6945', 'CISCO', 1, 0, 'SCCP6945.9-2-1-0', 'loadInformation564', 0, NULL), ('6961', 'CISCO', 1, 0, 'SCCP69xx.9-2-1-0', 'loadInformation497', 0, NULL), ('7902', 'CISCO', 1, 1, 'CP7902080002SCCP060817A', 'loadInformation30008', 0, NULL), " .
                 "('7905', 'CISCO', 1, 1, 'CP7905080003SCCP070409A', 'loadInformation20000', 0, NULL), ('7906', 'CISCO', 1, 1, 'SCCP11.9-2-1S', 'loadInformation369', 1, 'SEP0000000000.cnf.xml_791x_template'), ('7910', 'CISCO', 1, 1, 'SCCP11.9-2-1S', 'loadInformation6', 1, 'SEP0000000000.cnf.xml_791x_template'), ('7911', 'CISCO', 1, 1, 'SCCP11.9-2-1S', 'loadInformation307', 1, 'SEP0000000000.cnf.xml_791x_template'), ('7912', 'CISCO', 1, 1, 'CP7912080004SCCP080108A', 'loadInformation30007', 0, NULL), ('7914', 'CISCO', 0, 14, 'S00105000400', 'loadInformation124', 1, NULL),('7914,7914', 'CISCO', 0, 28, 'S00105000400', 'loadInformation124', 1, NULL), ('7915', 'CISCO', 0, 24, 'B015-1-0-4', 'loadInformation227', 1, NULL), ('7915,7915', 'CISCO', 0, 48, 'B015-1-0-4', 'loadInformation228', 1, NULL), ('7916', 'CISCO', 0, 24, 'B015-1-0-4', 'loadInformation229', 1, NULL), " .
@@ -320,17 +392,27 @@ $check = $db->query($sql);
                 "('7941', 'CISCO', 1, 2, 'SCCP41.9-2-1S', 'loadInformation115', 0, 'SEP0000000000.cnf.xml_796x_template'),('7941G-GE', 'CISCO', 1, 2, 'SCCP41.9-2-1S', 'loadInformation309', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7942', 'CISCO', 1, 2, 'SCCP42.9-2-1S', 'loadInformation434', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7945', 'CISCO', 1, 2, 'SCCP45.9-2-1S', 'loadInformation435', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7960', 'CISCO', 3, 6, 'P0030801SR02', 'loadInformation7', 1, 'SEP0000000000.cnf.xml_796x_template'), ('7961', 'CISCO', 3, 6, 'SCCP41.9-2-1S', 'loadInformation30018', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7961G-GE', 'CISCO', 3, 6, 'SCCP41.9-2-1S', 'loadInformation308', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7962', 'CISCO', 3, 6, 'SCCP42.9-2-1S', 'loadInformation404', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7965', 'CISCO', 3, 6, 'SCCP45.9-2-1S', 'loadInformation436', 0, 'SEP0000000000.cnf.xml_796x_template'), ('7970', 'CISCO', 3, 8, 'SCCP70.9-2-1S', 'loadInformation30006', 0, NULL), ('7971', 'CISCO', 1, 2, 'SCCP75.9-2-1S', 'loadInformation119', 0, NULL), ('7975', 'CISCO', 3, 8, 'SCCP75.9-2-1S', 'loadInformation437', 0, NULL), ('7985', 'CISCO', 3, 8, 'cmterm_7985.4-1-7-0', 'loadInformation302', 0, NULL), ('8941', 'CISCO', 1, 0, 'SCCP894x.9-2-2-0', 'loadInformation586', 0, NULL), ('8945', 'CISCO', 1, 0, 'SCCP894x.9-2-2-0', 'loadInformation585', 0, NULL), ('ATA 186', 'CISCO', 1, 1, 'ATA030204SCCP090202A', 'loadInformation12', 0, NULL), ('ATA 187', 'CISCO', 1, 1, 'ATA187.9-2-3-1', 'loadInformation550', 0, NULL), ('CN622', 'MOTOROLA', 1, 1, '', 'loadInformation335', 0, NULL), ('Digital Access', 'CISCO', 1, 1, 'D001M022', 'loadInformation40', 0, NULL), ('Digital Access+', 'CISCO', 1, 1, 'D00303010033', 'loadInformation42', 0, NULL), ('E-Series', 'NOKIA', 1, 1, '', '', 0, NULL), ('ICC', 'NOKIA', 1, 1, '', '', 0, NULL), " .
                 "('IP Communicator', 'CISCO', 1, 1, '', 'loadInformation30016', 0, NULL), ('Nokia E', 'Nokia', 0, 28, '', 'loadInformation275', 0, NULL), ('VGC Phone', 'CISCO', 1, 1, '', 'loadInformation10', 0, NULL), ('VGC Virtual', 'CISCO', 1, 1, '', 'loadInformation11', 0, NULL);";
     $check = $db->query($sql);
-    if (DB::IsError($check)) {
+    if (db::IsError($check)) {
-        die_freepbx("Can not REPLACE defaults into sccpdevmodel table\n");
+        die_freepbx("Can not create sccpdevmodel table, error:$check\n");
+    }
+    return true;
 }
 
-    $sql = 'UPDATE `sccpdevice` set audio_tos="0xB8",audio_cos="6",video_tos="0x88",video_cos="5" where audio_tos=NULL or audio_tos="";';
+function InstallDB_updateSccpDevice() {
+    global $db;
+    outn("<li>" . _("Update sccpdevice") . "</li>");
+    $sql = "UPDATE `sccpdevice` set audio_tos='0xB8',audio_cos='6',video_tos='0x88',video_cos='5' where audio_tos=NULL or audio_tos='';";
     $check = $db->query($sql);
     if (DB::IsError($check)) {
         die_freepbx("Can not REPLACE defaults into sccpdevice table\n");
     }
+}
 
-    $sql = "DROP TRIGGER IF EXISTS trg_buttonconfig;
+function InstallDB_createButtonConfigTrigger() {
+    global $db;
+    outn("<li>" . _("(Re)Create buttonconfig trigger") . "</li>");
+    $sql = "
+    DROP TRIGGER IF EXISTS trg_buttonconfig;
     DELIMITER $$
     CREATE TRIGGER trg_buttonconfig BEFORE INSERT ON buttonconfig
     FOR EACH ROW
@@ -349,17 +431,16 @@ $check = $db->query($sql);
     if (DB::IsError($check)) {
         die_freepbx("Can not modify sccpdevice table\n");
     }
-    $sql_v3 = "CREATE OR REPLACE
+    return true;
-            ALGORITHM = MERGE
+}
-            VIEW sccpdeviceconfig AS
-            SELECT GROUP_CONCAT( CONCAT_WS( ',', buttonconfig.type, buttonconfig.name, buttonconfig.options )
-            ORDER BY instance ASC
-            SEPARATOR ';' ) AS button, sccpdevice.*
-            FROM sccpdevice
-            LEFT JOIN buttonconfig ON ( buttonconfig.device = sccpdevice.name )
-            GROUP BY sccpdevice.name;";
 
-    $sql_v0 = "CREATE OR REPLACE
+function InstallDB_CreateSccpDeviceConfigView($sccp_ver) {
+    global $db;
+    outn("<li>" . _("(Re)Create sccpdeviceconfig view") . "</li>");
+    $sql = "";
+    if ($sccp_ver < 430)  {
+        $sql= "
+        CREATE OR REPLACE
             ALGORITHM = MERGE
             VIEW sccpdeviceconfig AS
 
@@ -380,18 +461,39 @@ $check = $db->query($sql);
         FROM sccpdevice
         LEFT JOIN buttonconfig ON ( buttonconfig.device = sccpdevice.name )
         GROUP BY sccpdevice.name;";
-
-    if ($sccp_ver == 11)  {
-        $check = $db->query($sql_v3);
     } else {
-        $check = $db->query($sql_v0);
+        $sql = "
+        CREATE OR REPLACE 
+            ALGORITHM = MERGE
+            VIEW sccpdeviceconfig AS
+        SELECT GROUP_CONCAT( CONCAT_WS( ',', buttonconfig.type, buttonconfig.name, buttonconfig.options )
+        ORDER BY instance ASC
+        SEPARATOR ';' ) AS button, sccpdevice.*
+        FROM sccpdevice
+        LEFT JOIN buttonconfig ON ( buttonconfig.device = sccpdevice.name )
+        GROUP BY sccpdevice.name;";
     }
+    $results = $db->query($sql);
     if (DB::IsError($check)) {
-        die_freepbx("Can not modify sccpdevice table\n");
+        die_freepbx(sprintf(_("Error updating sccpdeviceconfig view. Command was: %s; error was: %s "), $sql, $results->getMessage()));
     }
+    return true;
+}    
+
+CheckSCCPManagerDBTables($table_req);
+CheckPermissions();
+CheckAsteriskVersion();
+$sccp_ver = CheckChanSCCPVersion($astman);
+InstallDB_sccpsettings();
+InstallDB_sccpdevmodel();
+InstallDB_updateSchema($db_config);
+InstallDB_fillsccpdevmodel();
+InstallDB_updateSccpDevice();
+InstallDB_createButtonConfigTrigger();
+InstallDB_CreateSccpDeviceConfigView($sccp_ver);
+outn("<br>");
 
 //    $ss->save_submit($request);
 //    $ss->sccp_create_sccp_init();
 //    $ss->sccp_db_save_setting();
-
 //}