is("employee")) ? "hidden" : ""?>>
+
+
+
+ value() : ""?>" />
+
+
+
+
+ value() : ""?>" />
+
+
+
+
+ value() : ""?>" />
+
+
+
+
+ value() : ""?>" />
+ +43 720 123456
+
+
+
+
+ value() : ""?>" />
+
+
+
@@ -557,9 +581,9 @@ $siteTitle = "Benutzer";
$("#employee").change(function () {
if ($("#employee").val() == "true") {
- $("#employee-number-container").show(400);
+ $("#employee-container").show(400);
} else {
- $("#employee-number-container").hide(400);
+ $("#employee-container").hide(400);
}
});
});
diff --git a/Layout/default/footer.php b/Layout/default/footer.php
index 4a7c9b0bb..749ad8949 100644
--- a/Layout/default/footer.php
+++ b/Layout/default/footer.php
@@ -16,6 +16,11 @@
+
+ is("employee")): ?>
+
+
+
+
+
+
+
diff --git a/Layout/default/topbar.php b/Layout/default/topbar.php
index 811bb578a..effb8f6fe 100644
--- a/Layout/default/topbar.php
+++ b/Layout/default/topbar.php
@@ -15,6 +15,43 @@
+
+
+
+
+ Ausgehende Identität:
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/User/UserController.php b/application/User/UserController.php
index 4d33f2a8a..9b55afc3f 100644
--- a/application/User/UserController.php
+++ b/application/User/UserController.php
@@ -313,6 +313,31 @@ class UserController extends mfBaseController
$pak->delete();
}
+ // vodia identity data
+ $vid = new WorkerFlag($user->id, "vodia_identity_domain");
+ if($r->vodia_identity_domain) {
+ $vid->value($r->vodia_identity_domain);
+ $vid->save();
+ } else {
+ $vid->delete();
+ }
+
+ $viu = new WorkerFlag($user->id, "vodia_identity_username");
+ if($r->vodia_identity_username) {
+ $viu->value($r->vodia_identity_username);
+ $viu->save();
+ } else {
+ $viu->delete();
+ }
+
+ $vdi = new WorkerFlag($user->id, "vodia_identity_default");
+ if($r->vodia_identity_default) {
+ $vdi->value($r->vodia_identity_default);
+ $vdi->save();
+ } else {
+ $vdi->delete();
+ }
+
}
@@ -406,6 +431,12 @@ class UserController extends mfBaseController
case "endse":
$return = $this->endSuperexpertApi();
break;
+ case "getVodiaIdentity":
+ $return = $this->getVodiaIdentityApi();
+ break;
+ case "setVodiaIdentity":
+ $return = $this->setVodiaIdentityApi();
+ break;
default:
$return = false;
}
@@ -419,6 +450,74 @@ class UserController extends mfBaseController
$this->returnJson($data);
}
+ private function getVodiaIdentityApi() {
+ if(!ENABLE_VODIA_IDENTITY_SWITCHER) {
+ return ["enabled" => false];
+ }
+
+ $vodia = new Vodia_Api(VODIA_API_URL, VODIA_API_ADMIN_USER, VODIA_API_ADMIN_PASS);
+
+ $domain = $this->me->getFlag("vodia_identity_domain")->value();
+ $username = $this->me->getFlag("vodia_identity_username")->value();
+ $default = $this->me->getFlag("vodia_identity_default")->value();
+
+
+ if(!$domain || !$username || !$default) {
+ return ["enabled" => false];
+ }
+
+ $current = $vodia->getUsersetting($domain, $username, "ani");
+ if($current) {
+ if(str_replace(" ", "", $current) == str_replace(" ", "", $default)) {
+ $current = $default;
+ }
+ } else {
+ $current = $default;
+ }
+
+ return [
+ "enabled" => true,
+ "domain" => $domain,
+ "username" => $username,
+ "default" => $default,
+ "default_number" => str_replace(" ", "", $default),
+ "current" => $current,
+ "identities" => VODIA_OUTBOUND_IDENTITIES,
+ ];
+ }
+
+ private function setVodiaIdentityApi() {
+ if(!ENABLE_VODIA_IDENTITY_SWITCHER) {
+ return ["enabled" => false];
+ }
+
+ $number = $this->request->number;
+ if(!$number) {
+ return false;
+ }
+
+ // expects number to start with +
+ if(!substr($number, 0, 1) == "+") {
+ return false;
+ }
+
+ $domain = $this->me->getFlag("vodia_identity_domain")->value();
+ $username = $this->me->getFlag("vodia_identity_username")->value();
+
+ if(!$domain || !$username) {
+ return ["enabled" => false];
+ }
+
+ $vodia = new Vodia_Api(VODIA_API_URL, VODIA_API_ADMIN_USER, VODIA_API_ADMIN_PASS);
+
+ if(!$vodia->setUsersettings($domain, $username, ["ani" => $number])) {
+ return false;
+ }
+
+ return ["enabled" => true, "number" => $number];
+
+ }
+
private function startSuperexpertApi() {
$me = new User();
$me->loadMe();
diff --git a/application/WorkerFlag/WorkerFlag.php b/application/WorkerFlag/WorkerFlag.php
index 4ef5fdacc..370548f9e 100644
--- a/application/WorkerFlag/WorkerFlag.php
+++ b/application/WorkerFlag/WorkerFlag.php
@@ -43,12 +43,12 @@ class WorkerFlag {
if($id) {
// update
- $this->db->update("WorkerFlag", $values, "id=$id");
+ $this->db->update("WorkerFlag", $values, "id=$id", ["value"]);
} else {
// insert
$values['create_by'] = $this->user->id;
$values['create'] = date('U');
- $id = $this->db->insert("WorkerFlag", $values);
+ $id = $this->db->insert("WorkerFlag", $values, ["value"]);
$this->id = $id;
}
diff --git a/lib/Vodia/Api.php b/lib/Vodia/Api.php
new file mode 100644
index 000000000..7119463bd
--- /dev/null
+++ b/lib/Vodia/Api.php
@@ -0,0 +1,148 @@
+log = mfLoghandler::singleton();
+
+ $this->baseurl = rtrim($baseurl, '/');
+ $this->admin_user = $admin_user;
+ $this->admin_pass = $admin_pass;
+
+ if(!$this->baseurl || !$this->admin_user || !$this->admin_pass) {
+ throw new Exception("Invalid Arguments");
+ }
+ }
+
+ private function _authenticate($domain) {
+ $url = $this->baseurl.VODIA_API_EP_SYSTEM_SESSION;
+
+ $session_id = false;
+ //$this->session_name = sprintf("%x", crc32(uniqid("thetool", true)));
+ $this->session_name = "auth";
+
+ $ctx_options = ["http" => [
+ "ignore_errors" => true,
+ "method" => "POST",
+ "headers" => [
+ "Accept: application/json",
+ "Content-Type: application/json",
+ ],
+ "content" => json_encode([
+ "name" => $this->session_name,
+ "value" => "$this->admin_user ".md5($this->admin_pass),
+ "admin" => true,
+ "domain" => $domain,
+ ]),
+ //"header" => $headers,
+ ]];
+
+ $this->log->debug(__METHOD__.": authenticating to $url for domain $domain, user $this->admin_user");
+ $this->log->debug(__METHOD__.": ".print_r($ctx_options, true));
+
+
+ $ctx = stream_context_create($ctx_options);
+ $output = file_get_contents($url, false, $ctx);
+ $this->log->debug(__METHOD__.": auth output: $output");
+
+ $m = [];
+ if(preg_match('/^"([^"]+)"$/', $output, $m)) {
+ if($m[1]) {
+ $session_id = $m[1];
+ }
+ }
+
+ if(!$session_id) {
+ throw new Exception("Authentication failed for domain $domain");
+ }
+
+ $this->session_id = $session_id;
+ return true;
+ }
+
+ public function setUsersettings($domain, $user, Array $user_settings) {
+ if(!$this->session_id) {
+ $this->_authenticate($domain);
+ }
+
+ $url = $this->baseurl.VODIA_API_EP_POST_USER_SETTINGS;
+ $url = str_replace("{DOMAIN}", $domain, $url);
+ $url = str_replace("{EXT}", $user, $url);
+
+ $ctx_options = [
+ "http" => [
+ "ignore_errors" => true,
+ "method" => "POST",
+ "header" => [
+ "Cookie: session=".$this->session_id,
+ "Accept: application/json",
+ "Content-Type: application/json",
+ ],
+ "content" => json_encode($user_settings),
+ ]
+ ];
+
+ $ctx = stream_context_create($ctx_options);
+ $output = file_get_contents($url, false, $ctx);
+
+ $this->log->debug(__METHOD__.": output: $output");
+
+ return true;
+ }
+
+ /**
+ * Get user settings for a specific user in a domain.
+ *
+ * @param string $domain The domain to query.
+ * @param string $user The user extension to query.
+ * @param string|bool $key Optional. If provided, only the value for this key will be returned.
+ * @return mixed Returns the user settings as an associative Array or a specific key's value as string if $key is provided or false if $key is not available.
+ */
+ public function getUsersetting($domain, $user, $key = false) {
+ if(!$this->session_id) {
+ $this->_authenticate($domain);
+ }
+
+ $url = $this->baseurl.VODIA_API_EP_GET_USER_SETTINGS;
+ $url = str_replace("{DOMAIN}", $domain, $url);
+ $url = str_replace("{EXT}", $user, $url);
+
+ $ctx_options = [
+ "http" => [
+ "ignore_errors" => true,
+ "method" => "GET",
+ "header" => [
+ "Cookie: session=".$this->session_id,
+ "Accept: application/json",
+ "Content-Type: application/json",
+ ],
+ ]
+ ];
+
+ $ctx = stream_context_create($ctx_options);
+ $output = file_get_contents($url, false, $ctx);
+
+ $this->log->debug(__METHOD__.": output: $output");
+
+ $user_settings = json_decode($output, true);
+
+ if($key) {
+ if(array_key_exists($key, $user_settings)) {
+ return $user_settings[$key];
+ } else {
+ return false;
+ }
+ }
+
+ return $user_settings;
+
+ }
+}
\ No newline at end of file
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index 913fde452..382a435f4 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -133,6 +133,33 @@ h1, h2, h3, h4, h5, h6 {
border-bottom: 2px solid #f1556c;
}*/
+#vodia-identities-list .list-group-item:hover {
+ background-color: #dee2e6;
+}
+#vodia-identities-list .list-group-item td.color-block {
+ width: 50px;
+ height: 16px;
+ color: #fff;
+ vertical-align: top;
+ text-align: center;
+ border: 1px solid #fff;
+}
+
+#vodia-identities-list .list-group-item td.color-block-blue {
+ background-color: #4b88e4;
+}
+
+#vodia-identities-list .list-group-item td.color-block-green {
+ background-color: #25b343;
+}
+#vodia-identities-list .list-group-item td.color-block-pink {
+ background-color: #f672a7;
+}
+#vodia-identities-list .list-group-item td.color-block-black {
+ background-color: #000;
+}
+
+
#topnav {
box-shadow: 2px 2px 1px #a0a0a0;
}
diff --git a/public/assets/js/xinon-vodia-identity.js b/public/assets/js/xinon-vodia-identity.js
new file mode 100644
index 000000000..74572e367
--- /dev/null
+++ b/public/assets/js/xinon-vodia-identity.js
@@ -0,0 +1,147 @@
+/* Vodia Outbound Identity */
+
+var vodia_identity = null;
+
+getVodiaIdentity();
+
+async function getVodiaIdentity() {
+
+ if(!$("#vodia-identity-switcher .phone-icon").hasClass("fa-spin")) {
+ $("#vodia-identity-switcher .phone-icon").addClass("fa-spin text-warning");
+ }
+
+ var response = await fetch(baseurl + '/User/Api/do=getVodiaIdentity');
+ if (!response.ok) {
+ $("#vodia-identity-switcher a.phone-icon i").removeClass("fa-spin");
+ return false;
+ }
+ var resp_json = await response.json();
+ if(resp_json.status != "OK") {
+ console.error("Error getting Vodia Identity: " + resp_json.message);
+ $("#vodia-identity-switcher a.phone-icon i").removeClass("fa-spin");
+ return false;
+ }
+ vodia_identity = resp_json.result;
+
+ if(!("enabled" in vodia_identity) || !vodia_identity.enabled) {
+ $("#vodia-identity-switcher a.phone-icon i").removeClass("fa-spin");
+ return true;
+ }
+
+
+ var default_ident = vodia_identity.default;
+ var default_ident_number = vodia_identity.default_number;
+
+ var current_ident = vodia_identity.current;
+ var current_ident_number = current_ident.replace(" ", "");
+
+ var identities = vodia_identity.identities;
+
+ $("#vodia-identity-container").show();
+
+ if(default_ident_number == current_ident_number) {
+ $("#vodia-identity-current-text").text("Standard");
+ $("#vodia-identity-current-number").text("(" + default_ident + ")");
+ $("#vodia-identity-switcher").attr("title", "Standard (" + default_ident + ")");
+ } else {
+ ident_found = false;
+ for(const [ident_name, ident] of Object.entries(identities)) {
+ if(ident.number == current_ident_number) {
+ ident_found = true;
+ $("#vodia-identity-current-text").text(ident_name);
+ $("#vodia-identity-current-number").text("(" + ident.display + ")");
+ $("#vodia-identity-switcher").attr("title", ident_name + " (" + ident.display + ")");
+ }
+ }
+ if(!ident_found) {
+ $("#vodia-identity-current-number").text(vodia_identity.current);
+ $("#vodia-identity-switcher").attr("title", vodia_identity.current);
+ }
+ }
+
+
+ $("#vodia-identities-list").empty();
+
+ let item = addVodiaIdentityListItem(
+ default_ident_number,
+ default_ident_number,
+ "Xinon Eigene Durchwahl",
+ "blue"
+ );
+
+ if(default_ident_number == current_ident_number) {
+ $(item).addClass("bg-info text-white");
+ $(item).find(".text-block").addClass("text-white");
+ $(item).removeClass("pointer");
+ } else {
+ $(item).click(function () {
+ setVodiaOutboundIdentity(default_ident_number)
+ });
+ }
+
+
+ for(const [ident_name, ident] of Object.entries(identities)) {
+
+ let item = addVodiaIdentityListItem(
+ ident.number,
+ ident.display,
+ ident_name,
+ ident.color
+ );
+
+ if(ident.number == current_ident_number) {
+ $(item).addClass("bg-info text-white");
+ $(item).find(".text-block").addClass("text-white");
+ $(item).removeClass("pointer");
+ } else {
+ $(item).click(function () {
+ setVodiaOutboundIdentity(ident.number)
+ });
+ }
+ }
+
+ $("#vodia-identity-switcher .phone-icon").removeClass("text-warning fa-spin");
+ $("#vodia-identity-switcher .phone-icon").addClass("fa-bounce");
+ setTimeout(() => { $("#vodia-identity-switcher .phone-icon").removeClass("fa-bounce"); }, 800);
+
+}
+
+function addVodiaIdentityListItem(number, number_display, name, color) {
+ let tpl = $("#vodia-identity-list-item-template")[0].innerHTML;
+ item = $($.parseXML(tpl)).contents();
+
+ $(item).data("number", number);
+
+ $(item).find("td.color-block").addClass("color-block-" + color);
+ $(item).find("span.name").text(name);
+ $(item).find("span.number").text("(" + number_display + ")");
+
+ $("#vodia-identities-list").append(item);
+ return item;
+}
+
+async function setVodiaOutboundIdentity(number) {
+ $("#vodia-identity-switcher .phone-icon").addClass("fa-spin text-warning");
+
+ $("#vodia-identities-list").empty();
+ $("#vodia-identities-list").append("![](" + baseurl + "img/ajax-loader.gif)
");
+
+ var response = await fetch(baseurl + '/User/Api/do=setVodiaIdentity',{
+ method: 'POST',
+ body: new URLSearchParams({
+ 'number': number
+ })
+ });
+ if (!response.ok) {
+ return false;
+ }
+ var resp_json = await response.json();
+ if(resp_json.status != "OK") {
+ console.error("Error setting Vodia Identity: " + resp_json.message);
+ notify.error("Fehler beim Setzen der Identität!");
+ }
+
+ getVodiaIdentity();
+
+ return true;
+}
\ No newline at end of file
+
+
+
+
+ + Ausgehende Telefonidentität umschalten: +
+-
+
+
| + | + + + | +
");
+
+ var response = await fetch(baseurl + '/User/Api/do=setVodiaIdentity',{
+ method: 'POST',
+ body: new URLSearchParams({
+ 'number': number
+ })
+ });
+ if (!response.ok) {
+ return false;
+ }
+ var resp_json = await response.json();
+ if(resp_json.status != "OK") {
+ console.error("Error setting Vodia Identity: " + resp_json.message);
+ notify.error("Fehler beim Setzen der Identität!");
+ }
+
+ getVodiaIdentity();
+
+ return true;
+}
\ No newline at end of file