split sidebar in 3 different viewHelpers

kokspflanze · Jun 27, 2015 · 2268036 · 2268036
1 parent aba5a55
commit 2268036
Show file tree

Hide file tree

Showing 9 changed files with 164 additions and 87 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -141,9 +141,11 @@
             'email/tpl/country' 			=> __DIR__ . '/../view/email/tpl/country.phtml',
 			'helper/sidebarWidget'			=> __DIR__ . '/../view/helper/sidebar.phtml',
 			'helper/sidebarLoggedInWidget'	=> __DIR__ . '/../view/helper/logged-in.phtml',
+            'helper/sidebarServerInfoWidget'=> __DIR__ . '/../view/helper/server-info.phtml',
             'helper/formWidget'		        => __DIR__ . '/../view/helper/form.phtml',
             'helper/formNoLabelWidget'		=> __DIR__ . '/../view/helper/form-no-label.phtml',
             'helper/newsWidget'             => __DIR__ . '/../view/helper/news-widget.phtml',
+            'helper/sidebarTimerWidget'     => __DIR__ . '/../view/helper/timer.phtml',
 			'zfc-ticket-system/new'			=> __DIR__ . '/../view/zfc-ticket-system/ticket-system/new.twig',
 			'zfc-ticket-system/view'		=> __DIR__ . '/../view/zfc-ticket-system/ticket-system/view.twig',
 			'zfc-ticket-system/index'		=> __DIR__ . '/../view/zfc-ticket-system/ticket-system/index.twig',

diff --git a/src/PServerCMS/Module.php b/src/PServerCMS/Module.php
@@ -80,6 +80,15 @@ public function getViewHelperConfig()
                 'newsWidget' => function ( AbstractPluginManager $pluginManager ) {
                     return new View\Helper\NewsWidget( $pluginManager->getServiceLocator() );
                 },
+                'loggedInWidgetPServerCMS' => function ( AbstractPluginManager $pluginManager ) {
+                    return new View\Helper\LoggedInWidget( $pluginManager->getServiceLocator() );
+                },
+                'serverInfoWidgetPServerCMS' => function ( AbstractPluginManager $pluginManager ) {
+                    return new View\Helper\ServerInfoWidget( $pluginManager->getServiceLocator() );
+                },
+                'timerWidgetPServerCMS' => function ( AbstractPluginManager $pluginManager ) {
+                    return new View\Helper\TimerWidget( $pluginManager->getServiceLocator() );
+                },
             ]
         ];
     }

diff --git a/src/PServerCMS/View/Helper/LoggedInWidget.php b/src/PServerCMS/View/Helper/LoggedInWidget.php
@@ -0,0 +1,27 @@
+<?php
+
+
+namespace PServerCMS\View\Helper;
+
+use Zend\View\Model\ViewModel;
+
+class LoggedInWidget extends InvokerBase
+{
+    /**
+     * @return string
+     */
+    public function __invoke()
+    {
+        $template = '';
+
+        if ($this->getAuthService()->hasIdentity()) {
+            $viewModel = new ViewModel([
+                'user' => $this->getAuthService()->getIdentity()
+            ]);
+            $viewModel->setTemplate('helper/sidebarLoggedInWidget');
+            $template = $this->getView()->render($viewModel);
+        }
+
+        return $template;
+    }
+}
diff --git a/src/PServerCMS/View/Helper/ServerInfoWidget.php b/src/PServerCMS/View/Helper/ServerInfoWidget.php
@@ -0,0 +1,22 @@
+<?php
+
+
+namespace PServerCMS\View\Helper;
+
+use Zend\View\Model\ViewModel;
+
+class ServerInfoWidget extends InvokerBase
+{
+    /**
+     * @return string
+     */
+    public function __invoke()
+    {
+        $viewModel = new ViewModel(array(
+            'serverInfo' => $this->getServerInfoService()->getServerInfo()
+        ));
+        $viewModel->setTemplate('helper/sidebarServerInfoWidget');
+
+        return $this->getView()->render($viewModel);
+    }
+}
diff --git a/src/PServerCMS/View/Helper/SideBarWidget.php b/src/PServerCMS/View/Helper/SideBarWidget.php
@@ -2,65 +2,18 @@
 
 namespace PServerCMS\View\Helper;
 
-use PServerCMS\Helper\Timer;
 use Zend\View\Model\ViewModel;
 
 class SideBarWidget extends InvokerBase
 {
-	/** @var array */
-	protected $timerService;
-
-	/**
+    /**
 	 * @return string
 	 */
 	public function __invoke()
     {
-		$template = '';
-		if($this->getAuthService()->getIdentity()){
-			$viewModel = new ViewModel(array(
-				'user' => $this->getAuthService()->getIdentity()
-			));
-			$viewModel->setTemplate('helper/sidebarLoggedInWidget');
-			$template = $this->getView()->render($viewModel);
-		}
-		$viewModel = new ViewModel(array(
-			'timer' => $this->getTimer(),
-			'serverInfo' => $this->getServerInfoService()->getServerInfo()
-		));
+		$viewModel = new ViewModel();
 		$viewModel->setTemplate('helper/sidebarWidget');
-		return sprintf('%s%s', $template, $this->getView()->render($viewModel));
-	}
-
-	/**
-	 * @return array
-	 */
-	protected function getTimer()
-    {
-		if(!$this->timerService){
-			$config = $this->getConfig();
-			$timerConfig = isset($config['pserver']['timer'])?$config['pserver']['timer']:array();
-			foreach($timerConfig as $data){
-				$time = 0;
-				$text = '';
-				if(!isset($data['type'])){
-					if(isset($data['days'])){
-						$time = Timer::getNextTimeDay( $data['days'], $data['hour'], $data['min'] );
-					}else{
-						$time = Timer::getNextTime( $data['hours'],$data['min'] );
-					}
-				}else{
-					$text = $data['time'];
-				}
-				$this->timerService[] = array(
-					'time' => $time,
-					'text' => $text,
-					'name' => $data['name'],
-					'icon' => $data['icon']
-				);
-			}
-		}
 
-		return $this->timerService;
+		return $this->getView()->render($viewModel);
 	}
-
 }
diff --git a/src/PServerCMS/View/Helper/TimerWidget.php b/src/PServerCMS/View/Helper/TimerWidget.php
@@ -0,0 +1,61 @@
+<?php
+
+
+namespace PServerCMS\View\Helper;
+
+use PServerCMS\Helper\Timer;
+use Zend\View\Model\ViewModel;
+
+class TimerWidget extends InvokerBase
+{
+    /** @var array */
+    protected $timerService;
+
+    /**
+     * @return string
+     */
+    public function __invoke()
+    {
+        $viewModel = new ViewModel(array(
+            'timer' => $this->getTimer(),
+        ));
+        $viewModel->setTemplate('helper/sidebarTimerWidget');
+
+        return $this->getView()->render($viewModel);
+    }
+
+    /**
+     * @return array
+     */
+    protected function getTimer()
+    {
+        if(!$this->timerService){
+            $config = $this->getConfig();
+            $timerConfig = isset($config['pserver']['timer'])?$config['pserver']['timer']:array();
+
+            if ($timerConfig) {
+                foreach($timerConfig as $data){
+                    $time = 0;
+                    $text = '';
+                    if(!isset($data['type'])){
+                        if(isset($data['days'])){
+                            $time = Timer::getNextTimeDay( $data['days'], $data['hour'], $data['min'] );
+                        }else{
+                            $time = Timer::getNextTime( $data['hours'],$data['min'] );
+                        }
+                    }else{
+                        $text = $data['time'];
+                    }
+                    $this->timerService[] = array(
+                        'time' => $time,
+                        'text' => $text,
+                        'name' => $data['name'],
+                        'icon' => $data['icon']
+                    );
+                }
+            }
+        }
+
+        return $this->timerService;
+    }
+}
diff --git a/view/helper/server-info.phtml b/view/helper/server-info.phtml
@@ -0,0 +1,17 @@
+<div>
+    <h3><?= $this->translate('Server Info') ?></h3>
+    <hr/>
+    <ul class="list-unstyled">
+        <li><b><?= $this->translate('PlayerOnline') ?></b> <?= $this->playerHistory() ?></li>
+        <?php if((bool)$this->serverInfo): ?>
+            <?php foreach($this->serverInfo as $curInfo): ?>
+                <?php /** @var \PServerCMS\Entity\ServerInfo $curInfo */ ?>
+                <li>
+                    <i class="<?= $this->escapeHtml($curInfo->getIcon()) ?>"></i>
+                    <b><?= $this->escapeHtml($curInfo->getLabel()) ?></b>
+                    <?= $this->escapeHtml($curInfo->getMemo()) ?>
+                </li>
+            <?php endforeach ?>
+        <?php endif ?>
+    </ul>
+</div>
diff --git a/view/helper/sidebar.phtml b/view/helper/sidebar.phtml
@@ -1,37 +1,3 @@
-<div>
-	<h3><?= $this->translate('Server Info') ?></h3>
-	<hr/>
-	<ul class="list-unstyled">
-		<li><b><?= $this->translate('PlayerOnline') ?></b> <?= $this->playerHistory() ?></li>
-		<?php if((bool)$this->serverInfo): ?>
-			<?php foreach($this->serverInfo as $curInfo): ?>
-				<?php /** @var \PServerCMS\Entity\ServerInfo $curInfo */ ?>
-				<li>
-					<i class="<?= $this->escapeHtml($curInfo->getIcon()) ?>"></i>
-					<b><?= $this->escapeHtml($curInfo->getLabel()) ?></b>
-					<?= $this->escapeHtml($curInfo->getMemo()) ?>
-				</li>
-			<?php endforeach ?>
-		<?php endif ?>
-	</ul>
-</div>
-<div class="margin-top-30">
-	<h3><?= $this->translate('Servertime') ?></h3>
-	<hr/>
-	<ul class="list-unstyled">
-		<li><i class="fa fa-clock-o"></i> <?= $this->translate('Timer') ?>: <span id="idTimerClock"><?php echo date('H:i:s') ?></span></li>
-		<?php $i=0; ?>
-		<?php if ((bool)$this->timer ): ?>
-			<?php foreach ($this->timer as $curTimer) : ?>
-				<li><i class="<?= $this->escapeHtml($curTimer['icon']) ?>"></i>
-					<?= $curTimer['name'] ?>:
-					<?php if ($curTimer['time'] > 0) { ?>
-						<span class="timerCountdown" id="<?php echo 'idTimeCountdown_'.$i++; ?>" data-time="<?= $curTimer['time'] ?>"></span>
-					<?php } else { ?>
-                        <?= $this->escapeHtml($curTimer['text']) ?>
-					<?php } ?>
-				</li>
-			<?php endforeach ?>
-		<?php endif ?>
-	</ul>
-</div>
+<?= $this->loggedInWidgetPServerCMS() ?>
+<?= $this->serverInfoWidgetPServerCMS() ?>
+<?= $this->timerWidgetPServerCMS() ?>
diff --git a/view/helper/timer.phtml b/view/helper/timer.phtml
@@ -0,0 +1,20 @@
+<div class="margin-top-30">
+    <h3><?= $this->translate('Servertime') ?></h3>
+    <hr/>
+    <ul class="list-unstyled">
+        <li><i class="fa fa-clock-o"></i> <?= $this->translate('Timer') ?>: <span id="idTimerClock"><?php echo date('H:i:s') ?></span></li>
+        <?php $i=0; ?>
+        <?php if ((bool)$this->timer ): ?>
+            <?php foreach ($this->timer as $curTimer) : ?>
+                <li><i class="<?= $this->escapeHtml($curTimer['icon']) ?>"></i>
+                    <?= $curTimer['name'] ?>:
+                    <?php if ($curTimer['time'] > 0) { ?>
+                        <span class="timerCountdown" id="<?php echo 'idTimeCountdown_'.$i++; ?>" data-time="<?= $curTimer['time'] ?>"></span>
+                    <?php } else { ?>
+                        <?= $this->escapeHtml($curTimer['text']) ?>
+                    <?php } ?>
+                </li>
+            <?php endforeach ?>
+        <?php endif ?>
+    </ul>
+</div>