[openmeetings-dev] [openmeetings] r4341 committed - Make webapp name configurable

Sun, 02 Oct 2011 01:13:54 -0700 

Revision: 4341
Author:   seba.wagner
Date:     Sun Oct  2 01:12:46 2011
Log:      Make webapp name configurable
http://code.google.com/p/openmeetings/source/detail?r=4341

Modified:
 /trunk/plugins/moodle_plugin/lang/de/openmeetings.php
 /trunk/plugins/moodle_plugin/lang/en/openmeetings.php
 /trunk/plugins/moodle_plugin/lang/fr/openmeetings.php
 /trunk/plugins/moodle_plugin/openmeetings_gateway.php
 /trunk/plugins/moodle_plugin/settings.php
 /trunk/plugins/moodle_plugin/view.php

=======================================
--- /trunk/plugins/moodle_plugin/lang/de/openmeetings.php Fri Sep 30 16:25:28 2011 +++ /trunk/plugins/moodle_plugin/lang/de/openmeetings.php Sun Oct 2 01:12:46 2011 
@@ -13,7 +13,8 @@
 $string['red5port'] = 'OpenMeetings Server Port';
 $string['openmeetingsAdminUser'] = 'OpenMeetings Admin Benutzer';
$string['openmeetingsAdminUserPass'] = 'OpenMeetings Admin Benutzer Passwort'; -$string['openmeetingsModuleKey'] = 'OpenMeetings Modul-Schlüssel (falls Sie mehrer Moodle Instanzen betreiben sollte der Schlüssel bei jeder Instanz anders sein)'; 
+$string['openmeetingsModuleKeyLabel'] = 'Module Key';
+$string['openmeetingsModuleKey'] = 'Erweiterte Einstellung: OpenMeetings Modul-Schlüssel (falls Sie mehrer Moodle Instanzen betreiben sollte der Schlüssel bei jeder Instanz anders sein)'; 

 $string['Room_Name'] = 'Raum name';
 $string['Room_Type'] = 'Raumtyp';
@@ -39,4 +40,7 @@
$string['Recording_TYPE_1'] = 'Die Funktion zum Aufzeichnen der Konferenz ist verfügbar und kann gestartet werden.'; $string['Recording_TYPE_2'] = 'Die Funktion zum Aufzeichnen der Konferenz ist nicht verfügbar.'; 

+$string['openmeetingsWebappnameLabel'] = 'OpenMeetings webapp name';
+$string['openmeetingsWebappnameDescription'] = 'Erweiterte Einstellung: Wenn sie die OpenMeetings applikation umbenannt haben kšnnen Sie hier einen alternativen Namen eingeben.'; 
+
 ?>
=======================================
--- /trunk/plugins/moodle_plugin/lang/en/openmeetings.php Fri Sep 30 16:25:28 2011 +++ /trunk/plugins/moodle_plugin/lang/en/openmeetings.php Sun Oct 2 01:12:46 2011 
@@ -13,7 +13,8 @@
 $string['red5port'] = 'OpenMeetings Server Port';
 $string['openmeetingsAdminUser'] = 'OpenMeetings Admin User';
 $string['openmeetingsAdminUserPass'] = 'OpenMeetings Admin User Password';
-$string['openmeetingsModuleKey'] = 'OpenMeetings Module key (vary for multiple instances using same OpenMeetings Server)'; 
+$string['openmeetingsModuleKeyLabel'] = 'Module Key';
+$string['openmeetingsModuleKey'] = 'Advanced setting: OpenMeetings Module key (vary for multiple instances using same OpenMeetings Server)'; 

 $string['Room_Name'] = 'Room name';
 $string['Room_Type'] = 'Room type';
@@ -39,4 +40,7 @@
 $string['Recording_TYPE_1'] = 'Recording functionality is available.';
 $string['Recording_TYPE_2'] = 'Recording functionality is not available.';

+$string['openmeetingsWebappnameLabel'] = 'OpenMeetings webapp name';
+$string['openmeetingsWebappnameDescription'] = 'Advanced setting: If you have renamed the OpenMeetings webapp you can enter your alternative name here.'; 
+
 ?>
=======================================
--- /trunk/plugins/moodle_plugin/lang/fr/openmeetings.php Fri Sep 30 16:25:28 2011 +++ /trunk/plugins/moodle_plugin/lang/fr/openmeetings.php Sun Oct 2 01:12:46 2011 
@@ -13,7 +13,8 @@
 $string['red5port'] = 'OpenMeetings Server Port';
 $string['openmeetingsAdminUser'] = 'OpenMeetings Admin User';
 $string['openmeetingsAdminUserPass'] = 'OpenMeetings Admin User Password';
-$string['openmeetingsModuleKey'] = 'OpenMeetings Module key (vary for multiple instances using same OpenMeetings Server)'; 
+$string['openmeetingsModuleKeyLabel'] = 'Module Key';
+$string['openmeetingsModuleKey'] = 'Advanced setting: OpenMeetings Module key (vary for multiple instances using same OpenMeetings Server)'; 

 $string['Room_Name'] = 'Nom Réunion';
 $string['Room_Type'] = 'Type Réunion';
@@ -38,4 +39,8 @@
 $string['Allow_Recording'] = 'Recording allowed';
 $string['Recording_TYPE_1'] = 'Recording functionality is available.';
 $string['Recording_TYPE_2'] = 'Recording functionality is not available.';
+
+$string['openmeetingsWebappnameLabel'] = 'OpenMeetings webapp name';
+$string['openmeetingsWebappnameDescription'] = 'Advanced setting: If you have renamed the OpenMeetings webapp you can enter your alternative name here.'; 
+
 ?>
=======================================
--- /trunk/plugins/moodle_plugin/openmeetings_gateway.php Fri Sep 30 11:48:26 2011 +++ /trunk/plugins/moodle_plugin/openmeetings_gateway.php Sun Oct 2 01:12:46 2011 
@@ -39,7 +39,7 @@

                //echo "DIRROOT: ".$CFG->dirroot."<br/>";
- $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/UserService?wsdl", "wsdl"); + $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/UserService?wsdl", "wsdl"); 
                $client_userService->setUseCurl(true);
                //echo "Client inited"."<br/>";
                $err = $client_userService->getError();
@@ -110,7 +110,7 @@

                //echo $client_userService."<br/>";
- $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/RoomService?wsdl", true); + $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/RoomService?wsdl", true); 

                $err = $client_roomService->getError();
                if ($err) {
@@ -169,7 +169,7 @@

                //echo $client_userService."<br/>";
- $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/RoomService?wsdl", true); + $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/RoomService?wsdl", true); 

                $err = $client_roomService->getError();
                if ($err) {
@@ -223,7 +223,7 @@

                //echo $client_userService."<br/>";
- $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/RoomService?wsdl", true); + $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/RoomService?wsdl", true); 

                $err = $client_roomService->getError();
                if ($err) {
@@ -278,7 +278,7 @@

                //echo $client_userService."<br/>";
- $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/RoomService?wsdl", true); + $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/RoomService?wsdl", true); 

                $err = $client_roomService->getError();
                if ($err) {
@@ -337,7 +337,7 @@

                //echo $client_userService."<br/>";
- $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/RoomService?wsdl", true); + $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/RoomService?wsdl", true); 

                $err = $client_roomService->getError();
                if ($err) {
@@ -374,7 +374,7 @@
        function openmeetings_getRecordingsByExternalRooms(){
                global $USER, $CFG;
- $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/RoomService?wsdl", true); + $client_roomService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/RoomService?wsdl", true); 

                $err = $client_roomService->getError();
                if ($err) {
@@ -412,7 +412,7 @@
        function openmeetings_setUserObject($username, $firstname, $lastname,
                        $profilePictureUrl, $email) {
            global $USER, $CFG;
- $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/UserService?wsdl", true); + $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/UserService?wsdl", true); 

                $err = $client_userService->getError();
                if ($err) {
@@ -457,7 +457,7 @@
function openmeetings_setUserObjectWithExternalUser($username, $firstname, $lastname, 
                        $profilePictureUrl, $email, $userId, $systemType) {
            global $USER, $CFG;
- $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/UserService?wsdl", true); + $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/UserService?wsdl", true); 

                $err = $client_userService->getError();
                if ($err) {
@@ -513,7 +513,7 @@
function openmeetings_setUserObjectAndGenerateRoomHashByURL($username, $firstname, $lastname, $profilePictureUrl, $email, $userId, $systemType, $room_id, $becomeModerator) { 
            global $USER, $CFG;
- $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/UserService?wsdl", true); + $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/UserService?wsdl", true); 

                $err = $client_userService->getError();
                if ($err) {
@@ -553,7 +553,7 @@
function openmeetings_setUserObjectAndGenerateRoomHashByURLAndRecFlag($username, $firstname, $lastname, $profilePictureUrl, $email, $userId, $systemType, $room_id, $becomeModerator, $allowRecording) { 
                global $USER, $CFG;
- $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/UserService?wsdl", true); + $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/UserService?wsdl", true); 

                $err = $client_userService->getError();
                if ($err) {
@@ -598,7 +598,7 @@
function openmeetings_setUserObjectAndGenerateRecordingHashByURL($username, $firstname, $lastname, 
                                                $userId, $systemType, 
$recording_id) {
            global $USER, $CFG;
- $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/openmeetings/services/UserService?wsdl", true); + $client_userService = new nusoap_client("http://".$CFG->openmeetings_red5host.":".$CFG->openmeetings_red5port."/".$CFG->openmeetings_webappname."/services/UserService?wsdl", true); 

                $err = $client_userService->getError();
                if ($err) {
=======================================
--- /trunk/plugins/moodle_plugin/settings.php   Fri Sep 30 08:49:19 2011
+++ /trunk/plugins/moodle_plugin/settings.php   Sun Oct  2 01:12:46 2011
@@ -15,7 +15,11 @@
$settings->add(new admin_setting_configpasswordunmask('openmeetings_openmeetingsAdminUserPass', get_string('openmeetingsAdminUserPass', 'openmeetings'), get_string('openmeetingsAdminUserPass', 'openmeetings'), "password", PARAM_TEXT));
-$settings->add(new admin_setting_configtext('openmeetings_openmeetingsModuleKey', get_string('openmeetingsModuleKey', 'openmeetings'), +$settings->add(new admin_setting_configtext('openmeetings_openmeetingsModuleKey', get_string('openmeetingsModuleKeyLabel', 'openmeetings'), get_string('openmeetingsModuleKey', 'openmeetings'), "moodle", PARAM_TEXT)); 
+
+$settings->add(new admin_setting_configtext('openmeetings_webappname', get_string('openmeetingsWebappnameLabel', 'openmeetings'), + get_string('openmeetingsWebappnameDescription', 'openmeetings'), "openmeetings", PARAM_TEXT)); 
+


=======================================
--- /trunk/plugins/moodle_plugin/view.php       Fri Sep 30 11:48:26 2011
+++ /trunk/plugins/moodle_plugin/view.php       Sun Oct  2 01:12:46 2011
@@ -170,10 +170,10 @@
                                }
$iframe_d = "http://".$CFG->openmeetings_red5host . ":" . $CFG->openmeetings_red5port . 
-                                                               "/" . 
"openmeetings/?" .
+                                                               
"/".$CFG->openmeetings_webappname."/?" .
                                                                "secureHash=" . 
$returnVal .
                                                                "&scopeRoomId=" 
. $scope_room_id .
-                                                               
"&swf=maindebug.swf8.swf" .
+                                                               
//"&swf=maindebug.swf8.swf" .
                                                                "&language=" . 
$openmeetings->language .
                                                                "&picture=" . 
$USER->picture .
                                                                "&user_id=". 
$USER->id .

--
You received this message because you are subscribed to the Google Groups 
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/openmeetings-dev?hl=en.

Reply via email to