svn commit: r1369881 - in /incubator/openmeetings/trunk/plugins/bitrix: classes/general/ install/components/openmeetings/rooms/ install/components/openmeetings/rooms/lang/en/ install/components/openmeetings/rooms/lang/ru/ install/components/openmeeting...

Mon, 06 Aug 2012 09:55:08 -0700 

Author: solomax
Date: Mon Aug  6 16:54:21 2012
New Revision: 1369881

URL: http://svn.apache.org/viewvc?rev=1369881&view=rev
Log:
OPENMEETINGS-390 embeded room in iframe replaced with external; Component ID is 
added

Added:
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/.parameters.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.parameters.php
Modified:
    incubator/openmeetings/trunk/plugins/bitrix/classes/general/openmeetings.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.description.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.parameters.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/en/template.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/template.php

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/classes/general/openmeetings.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/classes/general/openmeetings.php?rev=1369881&r1=1369880&r2=1369881&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/classes/general/openmeetings.php 
(original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/classes/general/openmeetings.php 
Mon Aug  6 16:54:21 2012
@@ -88,7 +88,6 @@ class COpenmeetings {
                        , 0//$becomeModeratorAsInt
                        , 0//$showAudioVideoTestAsInt
                        );
-               
                return $roomhash;
        }
 

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.description.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.description.php?rev=1369881&r1=1369880&r2=1369881&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.description.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.description.php
 Mon Aug  6 16:54:21 2012
@@ -19,6 +19,11 @@
  */
 if (!defined("B_PROLOG_INCLUDED") || B_PROLOG_INCLUDED!==true) die();
 
+$PathInstall = str_replace("\\", "/", __FILE__);
+$PathInstall = substr($PathInstall, 0, 
strlen($PathInstall)-strlen(".description.php"));
+
+require_once($PathInstall . 
"../../../modules/openmeetings/classes/general/openmeetings.php"); //Need to 
get COpenmeetings::GetString method
+
 $arComponentDescription = array(
     "NAME" => COpenmeetings::GetString(GetMessage("OPENMEETINGS_ROOMS_NAME")),
     "DESCRIPTION" => 
COpenmeetings::GetString(GetMessage("OPENMEETINGS_ROOMS_DESCRIPTION")),

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.parameters.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.parameters.php?rev=1369881&r1=1369880&r2=1369881&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.parameters.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/.parameters.php
 Mon Aug  6 16:54:21 2012
@@ -17,4 +17,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+if (!defined("B_PROLOG_INCLUDED") || B_PROLOG_INCLUDED!==true) die();
+
+if (!CModule::IncludeModule("openmeetings"))
+       return;
+
+$arComponentParameters = array(
+       "PARAMETERS" => array(
+               "ID" => array(
+                       "NAME" => 
COpenmeetings::GetString(GetMessage("OPENMEETINGS_ROOM_ID")),
+                       "TYPE" => "STRING",
+               ),
+       )
+);

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php?rev=1369881&r1=1369880&r2=1369881&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
 Mon Aug  6 16:54:21 2012
@@ -28,13 +28,22 @@ if (!$USER->IsAuthorized()) {
        return;
 }
 
-if (isset($_REQUEST["ID"]) && is_numeric($_REQUEST["ID"]) && $_REQUEST["ID"] > 
0) {
-       $arResult["ROOM"] = $_REQUEST["ID"];
-       $arResult["URL"] = COpenmeetings::GetOMUrl();
-       $arResult["HASH"] = COpenmeetings::GetRoomHash($_REQUEST["ID"]);
-       $arResult["LANGUAGE"] = 
COpenmeetings::GetString(GetMessage("OPENMEETINGS_LANGUAGE"));
-       $this->__templateName = "show_room";
-} else {
+function getRoom($id, &$arResult, &$comp) {
+       if (isset($id) && is_numeric($id) && $id > 0) {
+               $hash = COpenmeetings::GetRoomHash($id);
+               if ($hash) {
+                       $arResult["ROOM"] = $id;
+                       $arResult["URL"] = COpenmeetings::GetOMUrl();
+                       $arResult["HASH"] = $hash;
+                       $arResult["LANGUAGE"] = 
COpenmeetings::GetString(GetMessage("OPENMEETINGS_LANGUAGE"));
+                       $comp->__templateName = "show_room";
+                       return true;
+               }
+       }
+       return false;
+}
+
+if (!getRoom($arParams["ID"], $arResult, $this) && !getRoom($_REQUEST["ID"], 
$arResult, $this)) {
        $arResult["ROOMS"] = COpenmeetings::GetRoomList();
 }
 

Added: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/.parameters.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/.parameters.php?rev=1369881&view=auto
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/.parameters.php
 (added)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/.parameters.php
 Mon Aug  6 16:54:21 2012
@@ -0,0 +1,20 @@
+<?
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+$MESS ['OPENMEETINGS_ROOM_ID'] = "Id of Openmeetings room associated with this 
component";

Added: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.parameters.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.parameters.php?rev=1369881&view=auto
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.parameters.php
 (added)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.parameters.php
 Mon Aug  6 16:54:21 2012
@@ -0,0 +1,20 @@
+<?
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+$MESS ['OPENMEETINGS_ROOM_ID'] = "Идентификатор комнаты 
Openmeetings, связанной с этим компонентом";

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/en/template.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/en/template.php?rev=1369881&r1=1369880&r2=1369881&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/en/template.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/en/template.php
 Mon Aug  6 16:54:21 2012
@@ -17,5 +17,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-$MESS["NEED_FLASH"] = "This content requires the Adobe Flash Player: ";
-$MESS["GET_FLASH"] = "Get Flash";
+$MESS["FOLLOW_LINK"] = "Please follow the link to enter Webinar: ";

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php?rev=1369881&r1=1369880&r2=1369881&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
 Mon Aug  6 16:54:21 2012
@@ -17,5 +17,4 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-$MESS["NEED_FLASH"] = "Для отображения содержимого 
необходим проигрыватель Flash: ";
-$MESS["GET_FLASH"] = "Скачать проигрыватель Flash";
+$MESS["FOLLOW_LINK"] = "Пожалуйста перейдите по 
ссылке чтобы посетить Вебинар: ";

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/template.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/template.php?rev=1369881&r1=1369880&r2=1369881&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/template.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/template.php
 Mon Aug  6 16:54:21 2012
@@ -30,10 +30,6 @@ $swfurl = $arResult["URL"]
        . "&language=" . $arResult["LANGUAGE"];
 
 ?>
-<iframe src="<?=$swfurl?>" style="width: 800px; height: 600px;">
-       <p align="center">
-               
<strong><?=COpenmeetings::GetString(GetMessage("NEED_FLASH"))?><a
-                       
href="http://www.macromedia.com/go/getflash/";><?=COpenmeetings::GetString(GetMessage("GET_FLASH"))?></a>
-               </strong>!
-       </p>
-</iframe>
+<?=COpenmeetings::GetString(GetMessage("FOLLOW_LINK"));?><br/>
+<a href="<?=$swfurl?>" target="_BLANK"><?=$swfurl?></a>
+

Reply via email to