iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add some asterisk config settings, add room selection

This commit is contained in:
Angelo Cuccato 2009-12-27 23:27:32 +01:00
parent 80c3a857e7
commit 1006eee444
3 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
default-conf/var_www_includes/config_IAX.php
View File

@ -4,6 +4,9 @@ $IAXenable = TRUE;
//Setting Asterisk //Setting Asterisk
$IAXcontent="Engelsystem"; $IAXcontent="Engelsystem";
$IAXserver="Engelsystem:engelengel@10.1.1.1"; $IAXserver="voip.eventphone.de";
//Asterisk output dir
$AsteriskOutputDir="/var/spool/asterisk/outgoing";
?> ?>

9
includes/funktion_cron.php
View File

@ -35,7 +35,7 @@ function TID2Engeltype($TID)
function DialNumberIAX( $DECTnumber, $Time, $RID, $TID) function DialNumberIAX( $DECTnumber, $Time, $RID, $TID)
{ {
global $IAXenable, $IAXcontent, $IAXserver, $AnrufDelay, $DebugDECT; global $IAXenable, $IAXcontent, $IAXserver, $AnrufDelay, $DebugDECT, $Tempdir, $AsteriskOutputDir;
//Parameter verarbeiten //Parameter verarbeiten
$TimeH = substr( $Time, 11, 2); $TimeH = substr( $Time, 11, 2);
@ -84,7 +84,7 @@ function DialNumberIAX( $DECTnumber, $Time, $RID, $TID)
else else
{ {
// IAX file Schareiebn // IAX file Schareiebn
$CallFile = "/tmp/call_". date("Ymd_His"). "_$DECTnumber"; $CallFile = $Tempdir. "/call_". date("Ymd_His"). "_$DECTnumber";
if($DebugDECT) echo "IAX create file for dialing Number $DECTnumber\n"; if($DebugDECT) echo "IAX create file for dialing Number $DECTnumber\n";
$file = fopen( $CallFile, 'w' ); $file = fopen( $CallFile, 'w' );
@ -104,8 +104,9 @@ function DialNumberIAX( $DECTnumber, $Time, $RID, $TID)
// fputs( $file, "SetVar: Room=". RID2Room( $RID). "\n"); // fputs( $file, "SetVar: Room=". RID2Room( $RID). "\n");
// fputs( $file, "SetVar: Engeltype=". TID2Engeltype( $TID). "\n"); // fputs( $file, "SetVar: Engeltype=". TID2Engeltype( $TID). "\n");
fclose($file); fclose($file);
system( "chmod 777 $CallFile"); system( "chmod 777 ". $CallFile);
system( "mv $CallFile /var/spool/asterisk/outgoing"); system( "mv ". $CallFile. " ". $AsteriskOutputDir);
} }
else else
echo "error: $CallFile not created"; echo "error: $CallFile not created";

54
www-ssl/nonpublic/schichtplan.php
View File

@ -6,7 +6,20 @@ $submenus = 2;
if( isset($_GET["ausdatum"])) if( isset($_GET["ausdatum"]))
$ausdatum = $_GET["ausdatum"]; $ausdatum = $_GET["ausdatum"];
if( isset($_GET["raum"])) if( isset($_GET["raum"]))
{
$raum = $_GET["raum"]; $raum = $_GET["raum"];
if( $raum==-1 && isset($_GET["show"]))
{
$raum = "";
foreach ($_GET as $k => $v)
{
if( substr($k, 0, 5) == "raum_")
{
$raum = $raum. ";". $v;
}
}
}
}
include ("../../includes/header.php"); include ("../../includes/header.php");
include ("../../includes/funktionen.php"); include ("../../includes/funktionen.php");
@ -64,10 +77,21 @@ if ( !isset($raum) )
{ {
// Ausgabe wenn kein Raum Ausgewählt: // Ausgabe wenn kein Raum Ausgewählt:
echo Get_Text("pub_schicht_auswahl_raeume"). "<br><br>\n"; echo Get_Text("pub_schicht_auswahl_raeume"). "<br><br>\n";
if( isset($Room))
if( isset($Room))
{
echo "<form action=\"./schichtplan.php\" method=\"GET\">\n";
foreach( $Room as $RoomEntry ) foreach( $Room as $RoomEntry )
echo "\t<li><a href='./schichtplan.php?ausdatum=$ausdatum&raum=". $RoomEntry["RID"]. "'>". {
$RoomEntry["Name"]. "</a></li>\n"; echo "\t<li><input type=\"checkbox\" name=\"raum_". $RoomEntry["RID"]. "\" value=\"". $RoomEntry["RID"]." \">";
echo "<a href='./schichtplan.php?ausdatum=$ausdatum&raum=". $RoomEntry["RID"]. "'>". $RoomEntry["Name"]. "</a>";
echo "</input></li>\n";
}
echo "<input type=\"hidden\" name=\"ausdatum\" value=\"$ausdatum\">";
echo "<input type=\"hidden\" name=\"raum\" value=\"-1\">";
echo "<input type=\"submit\" name=\"show\" value=\"show\">\n";
echo "</form>\n";
}
echo "<br><br>"; echo "<br><br>";
echo Get_Text("pub_schicht_alles_1"). "<a href='./schichtplan.php?ausdatum=$ausdatum&raum=-1'> <u>". echo Get_Text("pub_schicht_alles_1"). "<a href='./schichtplan.php?ausdatum=$ausdatum&raum=-1'> <u>".
@ -84,6 +108,8 @@ else
{ // Wenn einraum Ausgewählt ist: { // Wenn einraum Ausgewählt ist:
if( $raum == -1 ) if( $raum == -1 )
echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":<br><br>"; echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":<br><br>";
elseif( substr( $raum, 0, 1) == ";" )
echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":<br><br>";
else else
echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum.
Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "<br><br>"; Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "<br><br>";
@ -102,6 +128,15 @@ else
if (SummRoomShifts($RoomEntry["RID"]) > 0) if (SummRoomShifts($RoomEntry["RID"]) > 0)
echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n"; echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n";
} }
elseif( substr( $raum, 0, 1) == ";" )
{
$words = preg_split("/;/", $raum);
foreach ($words as $word)
{
if( strlen(trim($word)) > 0)
echo "\t\t<th>". $RoomID[trim($word)]. "</th>\n";
}
}
else else
echo "\t\t<th>". $RoomID[$raum]. "</th>\n"; echo "\t\t<th>". $RoomID[$raum]. "</th>\n";
echo "\t</tr>\n"; echo "\t</tr>\n";
@ -136,6 +171,19 @@ else
if (SummRoomShifts($RoomEntry["RID"]) > 0) if (SummRoomShifts($RoomEntry["RID"]) > 0)
CreateRoomShifts( $RoomEntry["RID"] ); CreateRoomShifts( $RoomEntry["RID"] );
} }
elseif( substr( $raum, 0, 1) == ";" )
{
if( isset($Room))
{
$words = preg_split("/;/", $raum);
foreach ($words as $word)
{
if( strlen(trim($word)) > 0)
if (SummRoomShifts($word) > 0)
CreateRoomShifts( $word );
}
}
}
else else
CreateRoomShifts( $raum ); CreateRoomShifts( $raum );