removed reservermanialinks

This commit is contained in:
kremsy 2013-12-31 17:11:53 +01:00
parent 1a1d957d69
commit c434986282
2 changed files with 58 additions and 69 deletions

View File

@ -49,6 +49,7 @@ class IconManager implements CallbackListener {
/** /**
* Adds an Icon * Adds an Icon
*
* @param string $iconName * @param string $iconName
* @param string $iconLink * @param string $iconLink
*/ */
@ -58,6 +59,7 @@ class IconManager implements CallbackListener {
/** /**
* Gets an Icon by its name * Gets an Icon by its name
*
* @param $iconName * @param $iconName
* @return string * @return string
*/ */

View File

@ -2,15 +2,14 @@
namespace ManiaControl\Manialinks; namespace ManiaControl\Manialinks;
use ManiaControl\ManiaControl;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\Manialinks\ManialinkPageAnswerListener;
use ManiaControl\Players\Player;
use FML\ManiaLink;
use FML\Controls\Control; use FML\Controls\Control;
use FML\Controls\Frame; use FML\Controls\Frame;
use FML\Controls\Labels\Label_Text; use FML\Controls\Labels\Label_Text;
use FML\ManiaLink;
use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\Callbacks\CallbackManager;
use ManiaControl\ManiaControl;
use ManiaControl\Players\Player;
require_once __DIR__ . '/StyleManager.php'; require_once __DIR__ . '/StyleManager.php';
require_once __DIR__ . '/IconManager.php'; require_once __DIR__ . '/IconManager.php';
@ -43,7 +42,6 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
*/ */
private $maniaControl = null; private $maniaControl = null;
private $pageAnswerListeners = array(); private $pageAnswerListeners = array();
private $maniaLinkIdCount = 0;
/** /**
* Create a new manialink manager * Create a new manialink manager
@ -58,8 +56,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
// Register for callbacks // Register for callbacks
$this->registerManialinkPageAnswerListener(self::ACTION_CLOSEWIDGET, $this, 'closeWidgetCallback'); $this->registerManialinkPageAnswerListener(self::ACTION_CLOSEWIDGET, $this, 'closeWidgetCallback');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
'handleManialinkPageAnswer');
} }
/** /**
@ -73,6 +70,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
public function registerManialinkPageAnswerListener($actionId, ManialinkPageAnswerListener $listener, $method) { public function registerManialinkPageAnswerListener($actionId, ManialinkPageAnswerListener $listener, $method) {
if(!method_exists($listener, $method)) { if(!method_exists($listener, $method)) {
trigger_error("Given listener for actionId '{$actionId}' doesn't have callback method '{$method}'!"); trigger_error("Given listener for actionId '{$actionId}' doesn't have callback method '{$method}'!");
return false; return false;
} }
if(!array_key_exists($actionId, $this->pageAnswerListeners) || !is_array($this->pageAnswerListeners[$actionId])) { if(!array_key_exists($actionId, $this->pageAnswerListeners) || !is_array($this->pageAnswerListeners[$actionId])) {
@ -81,6 +79,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
} }
// Register page answer listener // Register page answer listener
array_push($this->pageAnswerListeners[$actionId], array($listener, $method)); array_push($this->pageAnswerListeners[$actionId], array($listener, $method));
return true; return true;
} }
@ -95,21 +94,8 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
foreach ($keys as $key) { foreach ($keys as $key) {
unset($this->pageAnswerListeners[$key]); unset($this->pageAnswerListeners[$key]);
} }
return true;
}
/** return true;
* Reserve manialink ids
*
* @param int $count
* @return array
*/
public function reserveManiaLinkIds($count) {
$manialinkIds = array();
for ($i = 0; $i < $count; $i++) {
array_push($manialinkIds, $this->maniaLinkIdCount++);
}
return $manialinkIds;
} }
/** /**
@ -145,20 +131,20 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
return $this->maniaControl->client->query('SendDisplayManialinkPage', $manialinkText, $timeout, $hideOnClick); return $this->maniaControl->client->query('SendDisplayManialinkPage', $manialinkText, $timeout, $hideOnClick);
} }
if(is_string($logins)) { if(is_string($logins)) {
return $this->maniaControl->client->query('SendDisplayManialinkPageToLogin', $logins, $manialinkText, $timeout, return $this->maniaControl->client->query('SendDisplayManialinkPageToLogin', $logins, $manialinkText, $timeout, $hideOnClick);
$hideOnClick);
} }
if(is_array($logins)) { if(is_array($logins)) {
$success = true; $success = true;
foreach ($logins as $login) { foreach ($logins as $login) {
$subSuccess = $this->maniaControl->client->query('SendDisplayManialinkPageToLogin', $login, $manialinkText, $timeout, $subSuccess = $this->maniaControl->client->query('SendDisplayManialinkPageToLogin', $login, $manialinkText, $timeout, $hideOnClick);
$hideOnClick);
if(!$subSuccess) { if(!$subSuccess) {
$success = false; $success = false;
} }
} }
return $success; return $success;
} }
return false; return false;
} }
@ -256,6 +242,7 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
$frames[] = $frame; // add Frame to the frames array $frames[] = $frame; // add Frame to the frames array
} }
return $frames; return $frames;
} }
} }