Author: solomax
Date: Thu Jul 26 17:57:44 2012
New Revision: 1366111
URL: http://svn.apache.org/viewvc?rev=1366111&view=rev
Log:
OPENMEETINGS-383 code clenup
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/controllers/rec.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/install.sql
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/models/room.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetingsRoomManagament.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetings_gateway.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/tables/room.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/uninstall.sql
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/om/tmpl/default.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rec/tmpl/default.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/tmpl/form.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/view.html.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rooms/tmpl/default.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/controllers/rec.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/delrec/tmpl/default.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/om/tmpl/default.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/tmpl/default.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/view.rec.php
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec_link/tmpl/default.php
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/controllers/rec.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/controllers/rec.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/controllers/rec.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/controllers/rec.php
Thu Jul 26 17:57:44 2012
@@ -54,24 +54,14 @@ class RoomsControllerRec extends JContro
* constructor (registers additional tasks to methods)
* @return void
*/
- function __construct()
- {
+ function __construct() {
parent::__construct();
-
- // Register Extra tasks
- //$this->registerTask('add' , 'edit'); //'add' , 'edit' ,
'rec'
- // $this->registerTask('rec' , 'rec');
}
function rec(){
-
-
JRequest::setVar( 'view', 'rec' );
parent::display();
- //print_r($om_recordings_return->);
-
-
}
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/install.sql
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/install.sql?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/install.sql
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/install.sql
Thu Jul 26 17:57:44 2012
@@ -22,8 +22,6 @@ CREATE TABLE `#__om_rooms` (
`is_public` tinyint(3) NOT NULL default '0',
`appointment` tinyint(3) NOT NULL default '0',
`is_moderated_room` tinyint(3) NOT NULL default '1',
- `allow_private_chat` tinyint(3) NOT NULL default '1',
- `hide_user_list_for_non_moderators` tinyint(3) NOT NULL default '1',
`room_validity` int(10) NOT NULL default '0',
`date_type` date NOT NULL default 0,
@@ -31,8 +29,6 @@ CREATE TABLE `#__om_rooms` (
`duration` int(10) NOT NULL default '0',
`repeat_type` tinyint(3) NOT NULL default '0',
`weekday_type` int(10) NOT NULL default '0',
- `logo` varchar(100) NOT NULL,
-
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Openmeetings: Conference
Rooms' AUTO_INCREMENT=5 ;
@@ -44,12 +40,3 @@ CREATE TABLE `#__om_rooms_users` (
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Openmeetings: Conference
Rooms User' AUTO_INCREMENT=5 ;
-
-
-CREATE TABLE `#__om_rooms_flexigroups` (
- `id` int(10) unsigned NOT NULL auto_increment,
- `om_room_id` int(10) NOT NULL,
- `flexigroup_id` int(10) NOT NULL,
-
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Openmeetings: Conference
Rooms Flexigroups' AUTO_INCREMENT=5 ;
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/models/room.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/models/room.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/models/room.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/models/room.php
Thu Jul 26 17:57:44 2012
@@ -91,9 +91,6 @@ class RoomsModelRoom extends JModel
$row =& $this->getTable();
$data = JRequest::get( 'post' );
- if (array_key_exists("flexigroups", $data)) {
- $flexigroups = $data["flexigroups"];
- }
$owners = $data["owner"];
$data["owner"] = -1;
@@ -102,7 +99,7 @@ class RoomsModelRoom extends JModel
$data["repeat_type"] = 0;
}
//Update room
- if(!empty($data[room_id])){
+ if(!empty($data['room_id'])){
$omRoomManagament = new
openmeetingsRoomManagament();
$room_id = $omRoomManagament->
updateRoomWithModeration($data);
@@ -116,7 +113,7 @@ class RoomsModelRoom extends JModel
//create a Meetingroom in Openmeetings
$omRoomManagament = new
openmeetingsRoomManagament();
$room_id = $omRoomManagament->
createRoomWithModeration($data);
- $data[room_id] = $room_id;
+ $data['room_id'] = $room_id;
//Make sure the Openmeetings Room was succsefully
created
if($room_id < 1){
@@ -142,7 +139,7 @@ class RoomsModelRoom extends JModel
$this->setError($this->_db->getErrorMsg());
return false;
}
- if (!is_int($data["number_of_partizipants"])) {
+ if (!is_numeric($data["number_of_partizipants"])) {
//TODO investigate!!
//weird behavior number_of_partizipants added as 0 (not
NULL)
$query = ' UPDATE #__om_rooms SET
number_of_partizipants = NULL WHERE room_id = ' . $room_id;
@@ -168,24 +165,6 @@ class RoomsModelRoom extends JModel
}
- //FlexiGroups
-
- $query = ' DELETE FROM #__om_rooms_flexigroups ' .
- ' WHERE om_room_id = '. $row->id . '';
- $this->_db->setQuery( $query );
- $this->_db->query();
-
- foreach ($flexigroups as $key => $flexigroup_id) {
- //print_r("<BR/>".$owner_user_id);
-
- $query = ' INSERT INTO #__om_rooms_flexigroups '.
- ' (om_room_id,flexigroup_id) ' .
- ' VALUES ' .
- ' ('. $row->id .','. $flexigroup_id .') ';
- $this->_db->setQuery( $query );
- $this->_db->query();
-
- }
return true;
}
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetingsRoomManagament.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetingsRoomManagament.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetingsRoomManagament.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetingsRoomManagament.php
Thu Jul 26 17:57:44 2012
@@ -36,9 +36,6 @@ class openmeetingsRoomManagament {
$openmeetings->isDemoRoom = 0;
$openmeetings->demoTime = "";
$openmeetings->isModeratedRoom =
$data['is_moderated_room'];
- $openmeetings->allow_private_chat =
$data['allow_private_chat'];
- $openmeetings->hide_user_list_for_non_moderators =
$data['hide_user_list_for_non_moderators'];
- $openmeetings->is_translated = $data['translatedroom'];
$roomid =
$openmeetings_gateway->openmeetings_createroomwithmod($openmeetings);
@@ -61,9 +58,6 @@ class openmeetingsRoomManagament {
$openmeetings->isDemoRoom = 0;
$openmeetings->demoTime = "";
$openmeetings->isModeratedRoom =
$data['is_moderated_room'];
- $openmeetings->allow_private_chat =
$data['allow_private_chat'];
- $openmeetings->hide_user_list_for_non_moderators =
$data['hide_user_list_for_non_moderators'];
- $openmeetings->is_translated = $data['translatedroom'];
$roomid =
$openmeetings_gateway->updateRoomWithModeration($openmeetings);
return $roomid;
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetings_gateway.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetings_gateway.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetings_gateway.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/om_gateway/openmeetings_gateway.php
Thu Jul 26 17:57:44 2012
@@ -27,11 +27,15 @@ class openmeetings_gateway {
var $session_id = "";
var $params = "";
- function getUrl() {
+ function getOMUrl() {
if (!$this->params) {
- $this->params =
&JComponentHelper::getParams('com_openmeetings_conference');
+ $this->params = &JComponentHelper::getParams(
'com_openmeetings_conference' );
}
- return $this->params->get('url') . "/" .
$this->params->get('context') . "/services/";
+ return $this->params->get('url') . '/' .
$this->params->get('context');
+ }
+
+ function getUrl() {
+ return $this->getOMUrl() . "/services/";
}
function var_to_str($in) {
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/tables/room.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/tables/room.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/tables/room.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/tables/room.php
Thu Jul 26 17:57:44 2012
@@ -70,16 +70,6 @@ class TableRoom extends JTable
var $is_moderated_room = null;
/**
- * @var int
- */
- var $allow_private_chat = null;
-
- /**
- * @var int
- */
- var $hide_user_list_for_non_moderators = null;
-
- /**
*
* @var int
*/
@@ -126,12 +116,6 @@ class TableRoom extends JTable
*/
var $weekday_type = null;
- /**
- * @var string
- */
- var $logo = null;
-
-
/**
* Constructor
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/uninstall.sql
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/uninstall.sql?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/uninstall.sql
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/uninstall.sql
Thu Jul 26 17:57:44 2012
@@ -12,5 +12,3 @@
DROP TABLE IF EXISTS `#__om_rooms`;
DROP TABLE IF EXISTS `#__om_rooms_users`;
-
-DROP TABLE IF EXISTS `#__om_rooms_flexigroups`;
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/om/tmpl/default.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/om/tmpl/default.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/om/tmpl/default.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/om/tmpl/default.php
Thu Jul 26 17:57:44 2012
@@ -21,16 +21,13 @@ defined( '_JEXEC' ) or die( 'Restricted
?>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#5a5152" text="#333333" link="#FF3366" LEFTMARGIN="0"
TOPMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<?
require_once(JPATH_ADMINISTRATOR."/components/com_openmeetings_conference/om_gateway/openmeetings_gateway.php");
- $this->params = &JComponentHelper::getParams(
'com_openmeetings_conference' );
- $url_server = $this->params->get( 'url' );
-
$user = JFactory::getUser();
$openmeetings_gateway = new openmeetings_gateway();
@@ -42,7 +39,7 @@ defined( '_JEXEC' ) or die( 'Restricted
}
$showAudioVideoTest=1;
- $roomhash =
$openmeetings_gateway->openmeetings_setUserObjectAndGenerateRoomHash($user->username,$user->name,'',
picture, $user->email,$user->id, $this->room_id, $becomemoderator,
$showAudioVideoTest);
+ $roomhash =
$openmeetings_gateway->openmeetings_setUserObjectAndGenerateRoomHash($user->username,$user->name,'',
'', $user->email,$user->id, $this->room_id, $becomemoderator,
$showAudioVideoTest);
$language= $user->getParam('language', 'en-GB');
@@ -113,25 +110,18 @@ defined( '_JEXEC' ) or die( 'Restricted
// Get a database object
$db =& JFactory::getDBO();
- $query = ' SELECT logo FROM #__om_rooms '.
- ' WHERE room_id = '.$this->room_id;
-
- $db->setQuery($query);
- $logo = $db->loadResult();
-
if (!empty($roomhash)) {
//maindebug.swf8.swf
- $swfurl = $url_server .
- "/openmeetings/main.swf8.swf?" .
+ $swfurl = $openmeetings_gateway->getOMUrl() .
+ "/?" .
"scopeRoomId=" . $this->room_id .
"&secureHash=" . $roomhash .
"&lzproxied=solo" .
- "&language=" . $om_laguage_id .
- "&logo=" . JURI::root() .
"images/logos/" . $logo;
+ "&language=" . $om_laguage_id;
//echo $swfurl;
//exit();
$mainframe = JFactory::getApplication();
$mainframe->redirect($swfurl);
}
}
- ?>
+?>
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rec/tmpl/default.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rec/tmpl/default.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rec/tmpl/default.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rec/tmpl/default.php
Thu Jul 26 17:57:44 2012
@@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted acc
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#5a5152" text="#333333" link="#FF3366" LEFTMARGIN="0"
TOPMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/tmpl/form.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/tmpl/form.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/tmpl/form.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/tmpl/form.php
Thu Jul 26 17:57:44 2012
@@ -77,15 +77,6 @@ defined('_JEXEC') or die('Restricted acc
</tr>
<tr>
- <td align="right" class="key"><?php
echo JText::_( 'Select Logo:' ); ?>
- </td>
- <td><?php echo $this->logo ?>
- </td>
- <td><?php echo JText::_( 'Logo from
folder logos which will be appear in this room.'); ?>
- </td>
- </tr>
-
- <tr>
<td align="right" class="key"><?php
echo JText::_( 'Number of partizipants' ); ?>:</td>
<td><input class="text_area" type="text"
name="number_of_partizipants"
id="number_of_partizipants" size="8"
@@ -141,57 +132,6 @@ defined('_JEXEC') or die('Restricted acc
</tr>
<tr>
- <td align="right" class="key"><?php
echo JText::_( 'Allow private Chat:' ); ?>
- </td>
- <td><select name="allow_private_chat"
id="allow_private_chat">
- <option value="0"
-
<?=(!$this->croom->allow_private_chat?"selected":"")?>>
- <?php echo
JText::_( 'No' ); ?>
- </option>
- <option value="1"
-
<?=($this->croom->allow_private_chat?"selected":"")?>>
- <?php echo
JText::_( 'Yes' ); ?>
- </option>
- </select></td>
- <td><?php echo JText::_( 'Users can
chat between each other without using the main chat / in private Modus'); ?>
- </td>
- </tr>
-
- <tr>
- <td align="right" class="key"><?php
echo JText::_( 'Hide User List for Non Moderators:' ); ?>
- </td>
- <td><select
name="hide_user_list_for_non_moderators"
-
id="hide_user_list_for_non_moderators">
- <option value="0"
-
<?=(!$this->croom->hide_user_list_for_non_moderators?"selected":"")?>>
- <?php echo
JText::_( 'No' ); ?>
- </option>
- <option value="1"
-
<?=($this->croom->hide_user_list_for_non_moderators?"selected":"")?>>
- <?php echo
JText::_( 'Yes' ); ?>
- </option>
- </select></td>
- <td><?php echo JText::_( 'Only
Moderators can see and use the sidebar'); ?>
- </td>
- </tr>
-
- <tr>
- <td align="right" class="key"><?php
echo JText::_( 'Translated Room:' ); ?>
- </td>
- <td><select name="translatedroom"
id="translatedroom">
- <option value="0"
-
<?=(!$this->croom->translatedroom?"selected":"")?>>
- <?php echo
JText::_( 'No' ); ?>
- </option>
- <option value="1"
-
<?=($this->croom->translatedroom?"selected":"")?>>
- <?php echo
JText::_( 'Yes' ); ?>
- </option>
- </select></td>
- <td><?php echo JText::_( 'Provide
translation in the room'); ?></td>
- </tr>
-
- <tr>
<td align="right" class="key"><?php
echo JText::_( 'Select User:' ); ?>
</td>
<td><?php echo $this->owner ?>
@@ -201,34 +141,15 @@ defined('_JEXEC') or die('Restricted acc
</tr>
<tr>
- <td align="right" class="key"><?php
echo JText::_( 'Select FlexiGroup:' ); ?>
- </td>
- <td><?php echo $this->flexigroup ?>
- </td>
- <td><?php echo JText::_( 'All members
of the Flexigroup will be able to use the room.'); ?>
- </td>
- </tr>
-
- <tr>
<td align="right" class="key"><?php
echo JText::_( 'Room-Validity:' ); ?>
</td>
- <td><select name="room_validity"
id="room_validity">
-
- <!--
- <option value="0"
<?=(!$this->croom->room_validity?"selected":"")?>
onclick="javascript:document.adminForm.date_type.disabled=true,
document.adminForm.time_type.disabled=true,
document.adminForm.duration.disabled=true"><?php echo JText::_( 'Static' );
?></option>
- <option value="1" <?=($this->croom->room_validity?"selected":"")?>
onclick="javascript:document.adminForm.date_type.disabled=false,
document.adminForm.time_type.disabled=false,
document.adminForm.duration.disabled=false"><?php echo JText::_( 'Dynamic' );
?></option>
- -->
- <option value="0"
-
<?=(!$this->croom->room_validity?"selected":"")?>
-
onclick="enableTimeRepeatButtons()">
+ <td><select name="room_validity"
id="room_validity" onchange="enableTimeRepeatButtons()">
+ <option value="0"
<?=(!$this->croom->room_validity?"selected":"")?>>
<?php echo
JText::_( 'Static' ); ?>
</option>
- <option value="1"
-
<?=($this->croom->room_validity?"selected":"")?>
-
onclick="enableTimeRepeatButtons()">
+ <option value="1"
<?=($this->croom->room_validity?"selected":"")?>>
<?php echo
JText::_( 'Dynamic' ); ?>
</option>
-
</select></td>
<td><?php echo JText::_( 'Static rooms
are always visible on the front end. Dynamic rooms are visible only in a time
period.'); ?>
</td>
@@ -423,20 +344,6 @@ defined('_JEXEC') or die('Restricted acc
if (document.adminForm.room_validity.value == 1) {
bool = false;
}
-
- if (document.adminForm.userGroup.value == "Manager") {
-
- document.adminForm.name.disabled=true;
- document.adminForm.roomtype_id.disabled=true;
- document.adminForm.comment.disabled=true;
- document.adminForm.number_of_partizipants.disabled=true;
- document.adminForm.is_public.disabled=true;
- document.adminForm.appointment.disabled=true;
- document.adminForm.is_moderated_room.disabled=true;
- document.adminForm.room_validity.disabled=true;
- bool = true;
- }
-
document.adminForm.date_type.disabled=bool;
document.adminForm.time_type.disabled=bool;
document.adminForm.duration.disabled=bool;
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/view.html.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/view.html.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/view.html.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/room/view.html.php
Thu Jul 26 17:57:44 2012
@@ -33,7 +33,6 @@ class RoomsViewRoom extends JView
//get the hello
$croom =& $this->get('Data');
$isNew = ($croom->id < 1);
- $preselectLogo = '';
$text = $isNew ? JText::_( 'New' ) : JText::_( 'Edit' );
JToolBarHelper::title( JText::_( 'Room' ).': <small><small>[
' . $text.' ]</small></small>' );
@@ -50,24 +49,15 @@ class RoomsViewRoom extends JView
$this->croom->room_id = 0;
$this->croom->name = '';
$this->croom->comment = '';
- $this->croom->logo = '';
}
$db = JFactory::getDBO();
$user = JFactory::getUser();
- // get available user groups
- $gids = $user->getAuthorisedGroups();
- $gids = implode( ',', $gids );
-
// get list of usernames
$recipients = array( JHTML::_('select.option', '0', '- '.
JText::_( 'Select User' ) .' -' ) );
- $query = $query = 'SELECT u.id AS value, u.username AS text
FROM #__users u'
- . ' INNER JOIN #__user_usergroup_map uugm ON (u.id =
uugm.user_id)'
- . ' WHERE uugm.group_id IN ( '.$gids.' )'
- . ' ORDER BY u.name'
- ;
+ $query = $query = 'SELECT u.id AS value, u.username AS text
FROM #__users u ORDER BY u.name';
$db->setQuery( $query );
$recipients = array_merge( $recipients, $db->loadObjectList() );
@@ -85,27 +75,7 @@ class RoomsViewRoom extends JView
$ownerlist = JHTML::_('select.genericlist', $recipients,
'owner[]', 'class="inputbox" size="10" multiple', 'value', 'text',
$preselected);
$this->assignRef('owner', $ownerlist);
-
- $groupsFlexi = array( JHTML::_('select.option', '0', '- '.
JText::_( 'Select FlexiGroup' ) .' -' ) );
- $preselectedFlexiGroups = array();
-
- if ($croom->logo != "") {
- $query = ' SELECT logo FROM #__om_rooms '.
- ' WHERE id = '.$croom->id.'';
- $db->setQuery( $query );
- $preselectLogo = $db->loadResult();
- }
- $path = 'images/logos/';
- $logolist = JHTML::_( 'list.images', 'logo', $preselectLogo ,
null, $path );
-
- $this->assignRef('logo', $logolist);
-
//$ownerlist = JHTML::_('select.genericlist', $recipients,
'owner', 'class="inputbox" name="owner" size="10" multiple', 'value', 'text',
$croom->owner);
- $flexiGroupslist = JHTML::_('select.genericlist', $groupsFlexi,
'flexigroups[]', 'class="inputbox" size="10" multiple', 'value', 'text',
$preselectedFlexiGroups);
-
- $this->assignRef('flexigroup', $flexiGroupslist);
-
-
parent::display($tpl);
}
}
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rooms/tmpl/default.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rooms/tmpl/default.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rooms/tmpl/default.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/admin/views/rooms/tmpl/default.php
Thu Jul 26 17:57:44 2012
@@ -70,9 +70,6 @@ function ms2tm($ms)
<td align="center"><a href="<?php echo $link;
?>"><?php echo $row->name; ?>
</a>
</td>
- <!-- <td align="center"><?
- echo ms2tm($row->timeused)." /
".($row->credits ? ms2tm($row->credits * 60000).($row->creditsreset?"
".JText::_( 'each' )." ".$row->creditsreset." ".JText::_( 'days' ):"") :
JText::_( 'Unlimited' ));
- ?></td>-->
<td><a target="_blank" href="<?php echo
$participantlink; ?>"><?php echo $participantlink; ?>
</a></td>
</tr>
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/controllers/rec.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/controllers/rec.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/controllers/rec.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/controllers/rec.php
Thu Jul 26 17:57:44 2012
@@ -54,24 +54,14 @@ class OmControllerRec extends JControlle
* constructor (registers additional tasks to methods)
* @return void
*/
- function __construct()
- {
+ function __construct() {
parent::__construct();
-
- // Register Extra tasks
- //$this->registerTask('add' , 'edit'); //'add' , 'edit' ,
'rec'
- // $this->registerTask('rec' , 'rec');
}
function rec(){
-
-
JRequest::setVar( 'view', 'rec' );
parent::display();
- //print_r($om_recordings_return->);
-
-
}
@@ -84,7 +74,5 @@ class OmControllerRec extends JControlle
$msg = JText::_( 'Operation Cancelled' );
$this->setRedirect(
'index.php?option=com_openmeetings_conference', $msg );
}
-
-
}
?>
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/delrec/tmpl/default.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/delrec/tmpl/default.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/delrec/tmpl/default.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/delrec/tmpl/default.php
Thu Jul 26 17:57:44 2012
@@ -21,16 +21,13 @@ defined( '_JEXEC' ) or die( 'Restricted
?>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#5a5152" text="#333333" link="#FF3366" LEFTMARGIN="0"
TOPMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<?
require_once("administrator/components/com_openmeetings_conference/om_gateway/openmeetings_gateway.php");
- $this->params = &JComponentHelper::getParams(
'com_openmeetings_conference' );
- $url_server = $this->params->get( 'url' );
-
$user =& JFactory::getUser();
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/om/tmpl/default.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/om/tmpl/default.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/om/tmpl/default.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/om/tmpl/default.php
Thu Jul 26 17:57:44 2012
@@ -21,16 +21,13 @@ defined( '_JEXEC' ) or die( 'Restricted
?>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#5a5152" text="#333333" link="#FF3366" LEFTMARGIN="0"
TOPMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<?
require_once("administrator/components/com_openmeetings_conference/om_gateway/openmeetings_gateway.php");
- $this->params = &JComponentHelper::getParams(
'com_openmeetings_conference' );
- $url_server = $this->params->get( 'url' );
-
$user = JFactory::getUser();
$openmeetings_gateway = new openmeetings_gateway();
@@ -44,9 +41,9 @@ defined( '_JEXEC' ) or die( 'Restricted
$showAudioVideoTest=1;
if ($user->guest) {
- $roomhash =
$openmeetings_gateway->openmeetings_setUserObjectAndGenerateRoomHash('public',
'public','', 'picture', 'public','' , $this->room_id, $becomemoderator,
$showAudioVideoTest);
+ $roomhash =
$openmeetings_gateway->openmeetings_setUserObjectAndGenerateRoomHash('public',
'public','', '', 'public', '' , $this->room_id, $becomemoderator,
$showAudioVideoTest);
}else{
- $roomhash =
$openmeetings_gateway->openmeetings_setUserObjectAndGenerateRoomHash($user->username,$user->name,'',
'picture', $user->email,$user->id, $this->room_id, $becomemoderator,
$showAudioVideoTest);
+ $roomhash =
$openmeetings_gateway->openmeetings_setUserObjectAndGenerateRoomHash($user->username,$user->name,'',
'', $user->email,$user->id, $this->room_id, $becomemoderator,
$showAudioVideoTest);
}
@@ -116,23 +113,13 @@ defined( '_JEXEC' ) or die( 'Restricted
$om_laguage_id = 2;
}
- // Get a database object
- $db =& JFactory::getDBO();
-
- $query = ' SELECT logo FROM #__om_rooms '.
- ' WHERE room_id = '.$this->room_id;
-
- $db->setQuery($query);
- $logo = $db->loadResult();
-
if (!empty($roomhash)) {
- $swfurl = $url_server.
- "/openmeetings/main.swf8.swf?" .
+ $swfurl = $openmeetings_gateway->getOMUrl() .
+ "/?" .
"scopeRoomId=" . $this->room_id .
"&secureHash=" .$roomhash.
"&lzproxied=solo" .
- "&language=".$om_laguage_id.
-
"&logo=".JURI::root()."images/logos/".$logo;
+ "&language=".$om_laguage_id;
}
}
?>
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/tmpl/default.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/tmpl/default.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/tmpl/default.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/tmpl/default.php
Thu Jul 26 17:57:44 2012
@@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted acc
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#FFFFFF" text="#333333" link="#FF3366" LEFTMARGIN="0"
TOPMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/view.rec.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/view.rec.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/view.rec.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec/view.rec.php
Thu Jul 26 17:57:44 2012
@@ -26,50 +26,20 @@ require_once("administrator/components/c
jimport( 'joomla.application.component.view' );
-class OmViewRec extends JView
-{
-
-
+class OmViewRec extends JView {
/**
* view display method
* @return void
**/
- function display($tpl = null)
- {
-
+ function display($tpl = null) {
$user =& JFactory::getUser();
- //print_r($user);
-
- //$auth =& JFactory::getACL();
-
- //$auth->addACL( 'com_openmeetings_conference', 'add',
'administrator' , 'super administrator' );
-
- //print_r($auth->get_group_name($user->get('gid')));
-
-
- /*
- JToolBarHelper::title( JText::_( 'Rooms Manager' ),
'generic.png' );
- if ($auth->get_group_name($user->get('gid')) != Manager) {
- JToolBarHelper::deleteList();
- }
- JToolBarHelper::editListX();
- if ($auth->get_group_name($user->get('gid')) != Manager) {
- JToolBarHelper::addNewX();
- }
- */
-
//Check user rights
$acl =& JFactory::getACL();
$user =& JFactory::getUser();
$userGroup = $acl->get_group_name($user->get('gid'));
- //echo "USER-ID :: ".$user->id."<br/>";
- //echo "USERGROUP:: ".$userGroup."<br/>";
-
- //print_r($user);
-
$om_recordings_return = array();
$om_recordings = new openmeetingsRecordingManagament();
@@ -80,15 +50,9 @@ class OmViewRec extends JView
$om_recordings_return=$om_recordings->getFlvRecordingByExternalRoomType();
}
-
- //print_r($om_recordings_return);
- // Get data from the model
- //$items =& $this->get( 'Data');
-
$this->assignRef( 'om_recordings_return', $om_recordings_return
);
parent::display($tpl);
}
-
}
?>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec_link/tmpl/default.php
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec_link/tmpl/default.php?rev=1366111&r1=1366110&r2=1366111&view=diff
==============================================================================
---
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec_link/tmpl/default.php
(original)
+++
incubator/openmeetings/trunk/plugins/joomla/com_openmeetings_conference/views/rec_link/tmpl/default.php
Thu Jul 26 17:57:44 2012
@@ -21,16 +21,13 @@ defined( '_JEXEC' ) or die( 'Restricted
?>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body bgcolor="#5a5152" text="#333333" link="#FF3366" LEFTMARGIN="0"
TOPMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<?
require_once("administrator/components/com_openmeetings_conference/om_gateway/openmeetings_gateway.php");
- $this->params = &JComponentHelper::getParams(
'com_openmeetings_conference' );
- $url_server = $this->params->get( 'url' );
-
$user = JFactory::getUser();
$openmeetings_gateway = new openmeetings_gateway();
@@ -125,8 +122,8 @@ defined( '_JEXEC' ) or die( 'Restricted
}
if (!empty($rechash)) {
- $swfurl = $url_server.
- "/openmeetings/?" .
+ $swfurl = $openmeetings_gateway->getOMUrl() .
+ "/?" .
"secureHash=" .$rechash.
"&lzproxied=solo" .
"&language=".$om_laguage_id;
