Skip to content

Commit

Permalink
Merge commit 'refs/pull/179/merge' of github.com:marcelog/PAMI into PR5
Browse files Browse the repository at this point in the history
PR: marcelog#179
PR Description: Add some new actions and corresponding events about ConfBridge
Provided by: @brenard

Fixed minor merge conflict
  • Loading branch information
dkgroot committed Apr 24, 2019
2 parents 1119fd9 + 8438a43 commit 30e41ac
Show file tree
Hide file tree
Showing 11 changed files with 364 additions and 21 deletions.
13 changes: 8 additions & 5 deletions src/PAMI/Message/Action/ConfbridgeKickAction.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
/**
* Show sip peers.
* ConfbridgeKick action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Marcelo Gornstein <marcelog@gmail.com>
* @author Matt Styles <mstyleshk@gmail.com>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @version SVN: $Id$
* @link http://marcelog.github.com/PAMI/
Expand All @@ -30,22 +30,25 @@
namespace PAMI\Message\Action;

/**
* Show sip peers.
* ConfbridgeKick action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Marcelo Gornstein <marcelog@gmail.com>
* @author Matt Styles <mstyleshk@gmail.com>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @link http://marcelog.github.com/PAMI/
*/
class ConfBridgeKickAction extends ActionMessage
class ConfbridgeKickAction extends ActionMessage
{
/**
* Constructor.
*
* @param string $channel Channel to be muted.
* @param string $conference Conference on which to act.
*
* @return void
*/
public function __construct( $conference, $channel )
Expand Down
10 changes: 5 additions & 5 deletions src/PAMI/Message/Action/ConfbridgeListRoomsAction.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
/**
* Show sip peers.
* ConfbridgeListRooms action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Marcelo Gornstein <marcelog@gmail.com>
* @author Matt Styles <mstyleshk@gmail.com>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @version SVN: $Id$
* @link http://marcelog.github.com/PAMI/
Expand All @@ -30,18 +30,18 @@
namespace PAMI\Message\Action;

/**
* Show sip peers.
* ConfbridgeListRooms action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Marcelo Gornstein <marcelog@gmail.com>
* @author Matt Styles <mstyleshk@gmail.com>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @link http://marcelog.github.com/PAMI/
*/
class ConfBridgeListRoomsAction extends ActionMessage
class ConfbridgeListRoomsAction extends ActionMessage
{
/**
* Constructor.
Expand Down
46 changes: 45 additions & 1 deletion src/PAMI/Message/Action/ConfbridgeLockAction.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,54 @@
<?php
/**
* ConfbridgeLock action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @version SVN: $Id$
* @link http://marcelog.github.com/PAMI/
*
* Copyright 2011 Marcelo Gornstein <[email protected]>
*
* Licensed 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.
*
*/
namespace PAMI\Message\Action;

/**
* ConfbridgeLock action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @link http://marcelog.github.com/PAMI/
*/
class ConfbridgeLockAction extends ActionMessage
{
/**
* @param string $conference
* Constructor.
*
* @param string $conference Conference on which to act.
*
* @return void
*/
public function __construct($conference)
{
Expand Down
58 changes: 58 additions & 0 deletions src/PAMI/Message/Action/ConfbridgeStartRecordAction.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php
/**
* ConfbridgeStartRecord action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @version SVN: $Id$
* @link http://marcelog.github.com/PAMI/
*
* Copyright 2011 Marcelo Gornstein <[email protected]>
*
* Licensed 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.
*
*/
namespace PAMI\Message\Action;

/**
* ConfbridgeStartRecord action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @link http://marcelog.github.com/PAMI/
*/
class ConfbridgeStartRecordAction extends ActionMessage
{
/**
* Constructor.
*
* @param string $conference Conference on which to act.
*
* @return void
*/
public function __construct($conference)
{
parent::__construct('ConfbridgeStartRecord');
$this->setKey('Conference', $conference);
}
}
58 changes: 58 additions & 0 deletions src/PAMI/Message/Action/ConfbridgeStopRecordAction.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php
/**
* ConfbridgeStopRecord action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @version SVN: $Id$
* @link http://marcelog.github.com/PAMI/
*
* Copyright 2011 Marcelo Gornstein <[email protected]>
*
* Licensed 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.
*
*/
namespace PAMI\Message\Action;

/**
* ConfbridgeStopRecord action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @link http://marcelog.github.com/PAMI/
*/
class ConfbridgeStopRecordAction extends ActionMessage
{
/**
* Constructor.
*
* @param string $conference Conference on which to act.
*
* @return void
*/
public function __construct($conference)
{
parent::__construct('ConfbridgeStopRecord');
$this->setKey('Conference', $conference);
}
}
46 changes: 45 additions & 1 deletion src/PAMI/Message/Action/ConfbridgeUnlockAction.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,54 @@
<?php
/**
* ConfbridgeUnlock action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @version SVN: $Id$
* @link http://marcelog.github.com/PAMI/
*
* Copyright 2011 Marcelo Gornstein <[email protected]>
*
* Licensed 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.
*
*/
namespace PAMI\Message\Action;

/**
* ConfbridgeUnlock action message.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Action
* @author Matt Styles <[email protected]>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @link http://marcelog.github.com/PAMI/
*/
class ConfbridgeUnlockAction extends ActionMessage
{
/**
* @param string $conference
* Constructor.
*
* @param string $conference Conference on which to act.
*
* @return void
*/
public function __construct($conference)
{
Expand Down
17 changes: 13 additions & 4 deletions src/PAMI/Message/Event/ConfbridgeListRoomsCompleteEvent.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
/**
* Event triggered when .. ?
* Event triggered for the end of the list when an action ConfbridgeListRooms is issued.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Event
* @author Marcelo Gornstein <marcelog@gmail.com>
* @author Matt Styles <mstyleshk@gmail.com>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @version SVN: $Id$
* @link http://marcelog.github.com/PAMI/
Expand All @@ -32,17 +32,26 @@
use PAMI\Message\Event\EventMessage;

/**
* Event triggered when .. ?
* Event triggered for the end of the list when an action ConfbridgeListRooms is issued.
*
* PHP Version 5
*
* @category Pami
* @package Message
* @subpackage Event
* @author Marcelo Gornstein <marcelog@gmail.com>
* @author Matt Styles <mstyleshk@gmail.com>
* @license http://marcelog.github.com/PAMI/ Apache License 2.0
* @link http://marcelog.github.com/PAMI/
*/
class ConfbridgeListRoomsCompleteEvent extends EventMessage
{
/**
* Returns key: 'ListItems'.
*
* @return string
*/
public function getListItems()
{
return $this->getKey('ListItems');
}
}
5 changes: 2 additions & 3 deletions src/PAMI/Message/Event/ConfbridgeListRoomsEvent.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Event triggered when .. ?
* Event triggered for each conference when an action ConfbridgeListRooms is issued.
*
* PHP Version 5
*
Expand Down Expand Up @@ -32,7 +32,7 @@
use PAMI\Message\Event\EventMessage;

/**
* Event triggered when .. ?
* Event triggered for each conference when an action ConfbridgeListRooms is issued.
*
* PHP Version 5
*
Expand Down Expand Up @@ -84,5 +84,4 @@ public function getLocked()
{
return $this->getKey('Locked');
}

}
Loading

0 comments on commit 30e41ac

Please sign in to comment.