From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 4 Mar 2010 07:31:28 +0000 (-0700)
Subject: Horde: Remove Horde_Mobile dependency
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=97cb061195f50d9f64fc8f3f5e350076af3dd2c4;p=horde.git

Horde: Remove Horde_Mobile dependency
---

diff --git a/horde/login.php b/horde/login.php
index e0b59ed70..0b7800139 100644
--- a/horde/login.php
+++ b/horde/login.php
@@ -139,7 +139,7 @@ $ie_version = Horde_Util::getFormData('ie_version');
 
 /* Get URL/Anchor strings now. */
 $url_anchor = null;
-$url_in = $url_form = Horde_Util::getFormData('url');
+$url_in = Horde_Util::getFormData('url');
 if (($pos = strrpos($url_in, '#')) !== false) {
     $url_anchor = substr($url_in, $pos + 1);
     $url_in = substr($url_in, 0, $pos);
@@ -285,18 +285,25 @@ if ($reason = _getLogoutReasonString($error_reason)) {
 }
 
 if ($browser->isMobile()) {
-    require_once 'Horde/Mobile.php';
-
     /* Build the <select> widget containing the available languages. */
     if (!$is_auth && !$prefs->isLocked('language')) {
-        $lang_select = new Horde_Mobile_select('new_lang', 'popup', _("Language:"));
-        $lang_select->set('htmlchars', true);
+        $tmp = array();
         foreach ($langs as $val) {
-            $lang_select->add($val['name'], $val['val'], $val['sel']);
+            $tmp[$val['val']] = array(
+                'name' => $val['name'],
+                'selected' => $val['sel']
+            );
         }
+        $loginparams['new_lang'] = array(
+            'label' => _("Language"),
+            'type' => 'select',
+            'value' => $tmp
+        );
     }
 
+    require $registry->get('templates', 'horde') . '/common-header.inc';
     require $registry->get('templates', 'horde') . '/login/mobile.inc';
+    require $registry->get('templates', 'horde') . '/common-footer.inc';
     exit;
 }
 
@@ -314,7 +321,7 @@ require $registry->get('templates', 'horde') . '/common-header.inc';
 require $registry->get('templates', 'horde') . '/login/login.inc';
 
 if (!empty($js_code)) {
-    print '<script type="text/javascript">//<![CDATA[' . "\n" . implode(';', $js_code) . "\n//]]></script>\n";
+    echo Horde::wrapInlineScript(array(implode(';', $js_code)));
 }
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/horde/services/portal/mobile.php b/horde/services/portal/mobile.php
index af7d808bc..cd487414f 100644
--- a/horde/services/portal/mobile.php
+++ b/horde/services/portal/mobile.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Mobile portal page.
+ *
  * Copyright 2002-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
@@ -17,13 +19,15 @@ if (empty($fullname)) {
     $fullname = Horde_Auth::getAuth();
 }
 
-$m = new Horde_Mobile(_("Welcome"));
-$m->add(new Horde_Mobile_text(sprintf(_("Welcome, %s"), $fullname)));
-
+$links = array();
 foreach ($registry->listApps() as $app) {
     if ($registry->hasMobileView($app)) {
-        $m->add(new Horde_Mobile_link($registry->get('name', $app), Horde::url($registry->get('webroot', $app) . '/'), $registry->get('name', $app)));
+        $links[htmlspecialchars($registry->get('name', $app))] = Horde::url($registry->get('webroot', $app) . '/');
     }
 }
 
-$m->display();
+$title = _("Welcome");
+
+require HORDE_TEMPLATES . '/common-header.inc';
+require HORDE_TEMPLATES . '/portal/mobile.inc';
+require HORDE_TEMPLATES . '/common-footer.inc';
diff --git a/horde/templates/common-footer.inc b/horde/templates/common-footer.inc
index c104770b1..79d887033 100644
--- a/horde/templates/common-footer.inc
+++ b/horde/templates/common-footer.inc
@@ -1,8 +1,10 @@
+<?php if (!$GLOBALS['browser']->isMobile()): ?>
 <script type="text/javascript">
 if (document.title && parent.frames && parent.frames.horde_main) {
     parent.document.title = document.title;
 }
 </script>
-<?php if (isset($GLOBALS['notification'])) $GLOBALS['notification']->notify(array('listeners' => array('audio', 'javascript'))); ?>
+<?php $GLOBALS['notification']->notify(array('listeners' => array('audio', 'javascript'))); ?>
+<?php endif; ?>
 </body>
 </html>
diff --git a/horde/templates/common-header.inc b/horde/templates/common-header.inc
index ec6e71ea1..4e5f3acb8 100644
--- a/horde/templates/common-header.inc
+++ b/horde/templates/common-header.inc
@@ -21,6 +21,7 @@ if (!empty($refresh_time) && !empty($refresh_url)) {
 }
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
+<?php if (!$browser->isMobile()): ?>
 <link href="<?php echo $GLOBALS['registry']->getImageDir() ?>/favicon.ico" rel="SHORTCUT ICON" />
 <?php
 echo Horde::includeStylesheetFiles(array('additional' => Horde_Util::nonInputVar('horde_css_stylesheets', array())));
@@ -28,6 +29,7 @@ echo Horde::includeScriptFiles();
 echo implode("\n", Horde_Util::nonInputVar('linkTags', array()));
 Horde::outputInlineScript();
 ?>
+<?php endif ?>
 </head>
 
 <body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/horde/templates/login/mobile.inc b/horde/templates/login/mobile.inc
index 577915b0a..289af52fd 100644
--- a/horde/templates/login/mobile.inc
+++ b/horde/templates/login/mobile.inc
@@ -1,46 +1,38 @@
-<?php
-
-$m = new Horde_Mobile($title);
-$m->add(new Horde_Mobile_text(sprintf(_("Welcome to %s"), $registry->get('name'))));
-
-$f = new Horde_Mobile_form('login.php');
-$f->add(new Horde_Mobile_hidden('app', $app));
-$f->add(new Horde_Mobile_hidden('url', Horde_Util::getFormData('url', '')));
-$f->add(new Horde_Mobile_hidden('anchor_string', Horde_Util::getFormData('anchor_string', '')));
-
-foreach ($loginparams as $key => $val) {
-    switch ($val['type']) {
-    case 'hidden':
-        $f->add(new Horde_Mobile_hidden($key, isset($val['value']) ? $val['value'] : ''));
-        break;
-
-    case 'text':
-        $f->add(new Horde_Mobile_input($key, isset($val['value']) ? $val['value'] : '', $val['label']));
-        break;
+<div><?php printf(_("Welcome to %s"), htmlspecialchars($registry->get('name'))) ?></div>
 
-    case 'password':
-        $p = $f->add(new Horde_Mobile_input($key, isset($val['value']) ? $val['value'] : '', $val['label']));
-        $p->set('type', 'password');
-        break;
+<form action="login.php" method="post">
+ <input type="hidden" name="anchor_string" value="<?php echo htmlspecialchars(strval(Horde_Util::getFormData('anchor_string'))) ?>" />
+ <input type="hidden" name="app" value="<?php echo htmlspecialchars($app) ?>" />
+ <input type="hidden" name="url" value="<?php echo htmlspecialchars(strval(Horde_Util::getFormData('url'))) ?>" />
 
-    case 'select':
-        $s = $f->add(new Horde_Mobile_select($key, 'popup', $val['label']));
-        foreach ($val['value'] as $k2 => $v2) {
-            // Doesn't account for 'hidden' values
-            $s->add($v2['name'], $k2, !empty($v2['selected']));
+ <p>
+<?php
+    foreach ($loginparams as $key => $val) {
+        switch ($val['type']) {
+        case 'hidden':
+            echo '<input type="hidden" name="' . $key . '" value="' . (isset($val['value']) ? $val['value'] : '') . '" />';
+            break;
+
+        case 'text':
+        case 'password':
+        case 'select':
+            echo '<div><label for="' . $key . '"><em>' . $val['label'] . '</em> ';
+            if ($val['type'] == 'select') {
+                echo '<select id="' . $key . '" name="' . $key . '">';
+                foreach ($val['value'] as $k2 => $v2) {
+                    echo '<option value="' . $k2 . '"' . (empty($v2['selected']) ? '' : ' selected="selected"') . '>' . $v2['name'] . '</option>';
+                }
+                echo '</select>';
+            } else {
+                echo '<input id="' . $key . '" name="' . $key . '" ' . (($val['type'] == 'password') ? 'type="password" ' : '') . 'value="' . (isset($val['value']) ? $val['value'] : '') . '" />';
+            }
+            echo '</label></div>';
+            break;
         }
     }
-}
-
-if (!empty($lang_select)) {
-    $f->add($lang_select);
-}
-
-// Submit button.
-$f->add(new Horde_Mobile_submit($title, 'login_button'));
-
-// Add the form to the page.
-$m->add($f);
-
-// Display everything.
-$m->display();
+?>
+ </p>
+ <p>
+  <input type="submit" name="login_button" value="<?php echo htmlspecialchars($title) ?>" />
+ </p>
+</form>
diff --git a/horde/templates/portal/mobile.inc b/horde/templates/portal/mobile.inc
new file mode 100644
index 000000000..ba61a096f
--- /dev/null
+++ b/horde/templates/portal/mobile.inc
@@ -0,0 +1,7 @@
+<p><?php echo sprintf(_("Welcome, %s"), $fullname) ?></p>
+
+<ul>
+<?php foreach ($links as $key => $val): ?>
+ <li><a href="<?php echo $val ?>"><?php echo $key ?></a></li>
+<?php endforeach; ?>
+</ul>