[phpwiki-checkins] CVS: phpwiki/themes/default/templates userprefs.tmpl,1.37,1.38

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1:/tmp/cvs-serv17285

Modified Files:
	userprefs.tmpl 
Log Message:
More cleanup of UserPreferences.

Index: userprefs.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/userprefs.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -2 -b -p -d -r1.37 -r1.38

--- userprefs.tmpl	1 Dec 2003 22:54:56 -0000	1.37
+++ userprefs.tmpl	4 Dec 2003 19:21:10 -0000	1.38
@@ -10,5 +10,5 @@ foreach (explode(',','errmsg,isForm') as
 $plugin = $request->getArg('pagename');
 if ($request->isActionPage($request->getArg('pagename')) and 
-    $plugin != _("PreferencesInfo")) {
+    $plugin != _("PreferencesInfo") and $plugin != _("_PreferencesInfo")) {
     $isForm = true;
 }
@@ -16,8 +16,7 @@ if ($request->isActionPage($request->get
 $time = time();
 $user = &$request->getUser();
-$_upo = $user->getPreferences();
-$pref = $_upo->_prefs;
+$pref = $user->getPreferences();
 
-$offset = $pref['timeOffset'];
+$offset = $pref->get('timeOffset');
 $serverTime = $time - $offset * 3600;
 if ( $isForm )
@@ -29,8 +28,6 @@ if ( $isForm )
                                          'value' => $offset));
 else
-    $timeOffsetInput = $pref['timeOffset'];
+    $timeOffsetInput = $pref->get('timeOffset');
 
-if (empty($pref['relativeDates']))
-    $pref['relativeDates'] = false;
 $RelativeDatesCB = HTML(HTML::input(array('type' => 'hidden',
                                           'name' => 'pref[relativeDates][]',
@@ -39,7 +36,5 @@ $RelativeDatesCB = HTML(HTML::input(arra
                                           'name' => 'pref[relativeDates][]',
                                           'value' => '1',
-                                          'checked' => (bool) $pref['relativeDates'])));
-if (empty($pref['noLinkIcons']))
-    $pref['noLinkIcons'] = false;
+                                          'checked' => (bool) $pref->get('relativeDates'))));
 $NoLinkIconsCB = HTML(HTML::input(array('type' => 'hidden',
                                           'name' => 'pref[noLinkIcons][]',
@@ -48,5 +43,5 @@ $NoLinkIconsCB = HTML(HTML::input(array(
                                           'name' => 'pref[noLinkIcons][]',
                                           'value' => '1',
-                                          'checked' => (bool) $pref['noLinkIcons'])));
+                                          'checked' => (bool) $pref->get('noLinkIcons'))));
 
 function selectedOption ($value, $label = false) {
@@ -62,10 +57,10 @@ if ( $isForm ) {
     $SelectOptions = HTML(); 
     if (!empty($available_themes) and is_array($available_themes)) {
-	if (empty($pref['theme']))
+	if (!$pref->get('theme') or $pref->get('theme') == THEME)
 	    $SelectOptions->pushContent(selectedOption('',_("<system theme>")));
 	else
 	    $SelectOptions->pushContent(unselectedOption('',_("<system theme>")));
 	foreach ($available_themes as $theme) {
-	    if (!empty($pref['theme']) && $theme == $pref['theme'] and $theme != THEME)
+	    if ($theme == $pref->get('theme') and $theme != THEME)
 		$SelectOptions->pushContent(selectedOption($theme));
 	    else
@@ -79,10 +74,10 @@ if ( $isForm ) {
     $SelectOptions = HTML();
     if (!empty($available_languages) and is_array($available_languages)) {
-	if (empty($pref['lang']))
+	if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
 	    $SelectOptions->pushContent(selectedOption('',_("<system language>")));
 	else
 	    $SelectOptions->pushContent(unselectedOption('',_("<system language>")));
 	foreach ($available_languages as $lang) {
-	    if (!empty($pref['lang']) && $lang == $pref['lang'] and $lang != DEFAULT_LANGUAGE)
+	    if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
 		$SelectOptions->pushContent(selectedOption($lang));
 	    else
@@ -102,6 +97,6 @@ if ( $isForm ) {
     $SelectThemesDesc = _("Personal theme:");
     $SelectLanguagesDesc = _("Personal language:");
-    $SelectThemes = $pref['theme'];
-    $SelectLanguages = $pref['lang'];
+    $SelectThemes = $pref->get('theme');
+    $SelectLanguages = $pref->get('lang');
 }
 
@@ -116,14 +111,14 @@ if ($errmsg) $msg = HTML(HTML::h4(array(
   $fill = "&nbsp;";
 ?>
-<?= HTML::pre(sprintf("%12s: [% 10s]  %s\n",_("UserId"),$pref['userid'], " from " . $request->_user->auth_how()),
+<?= HTML::pre(sprintf("%12s: [% 10s]  %s\n",_("UserId"),$pref->get('userid'), " from " . $request->_user->auth_how()),
 	      sprintf("%12s: [% 10s]  %16s: [% 10s] | %8s: [%2s]\n","getId",$user->getId(),"getAuthenticatedId",$user->getAuthenticatedId(),"isSignedIn", $user->isSignedIn()),
-	      //sprintf("%12s: [% 10s]\n",_("Password"),$pref['passwd']),
+	      //sprintf("%12s: [% 10s]\n",_("Password"),$pref->get('passwd')),
 	      sprintf("%12s: [% 10s]  %15s: [% 8s]\n",
 		      _("Auth Level"),$user->_level,_("Auth Method"),$user->_authmethod),
 	      sprintf("%12s: [% 10s]\n",_("HomePage"),$user->homePage() ? $user->_homepage->_pagename : ''),
-	      sprintf("%12s: [% 10s]\n",_("E-Mail"),$pref['email']),
-	      //sprintf("%12s: [% 10s]\n",_("Notify"),$pref['notifyPages']),
-	      sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref['theme'], _("Current Theme"),$Theme->_name),
-	      sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Language"),$pref['lang'],_("Current Language"),$GLOBALS['LANG'])
+	      sprintf("%12s: [% 10s]\n",_("E-Mail"),$pref->get('email')),
+	      //sprintf("%12s: [% 10s]\n",_("Notify"),$pref->get('notifyPages')),
+	      sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref->get('theme'), _("Current Theme"),$Theme->_name),
+	      sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Language"),$pref->get('lang'),_("Current Language"),$GLOBALS['LANG'])
 	      ) ?>
 <?php } ?>
@@ -139,10 +134,10 @@ if ($errmsg) $msg = HTML(HTML::h4(array(
   <?php if ($isForm) { ?>
      <input type="text" name="pref[email]" size="30" maxlength="60"
-	    value="<?=$pref['email']?>" />
+	    value="<?=$pref->get('email')?>" />
   <?php } else { ?>
-     '<?= $pref['email'] ?>'
+     '<?= $pref->get('email') ?>'
   <?php } ?>
   &nbsp;&nbsp;<?= _("Status:") ?>&nbsp;&nbsp;
-  <?php if (!empty($pref['emailVerified']) && $pref['emailVerified']) { ?>
+  <?php if ($pref->get('emailVerified')) { ?>
     <?= _("Email verified.") ?>
   <?php } else { ?>
@@ -157,9 +152,9 @@ if ($errmsg) $msg = HTML(HTML::h4(array(
 /* ?>
   <?php /*if ($isForm) { ?>
-     &nbsp;<textarea name="pref[notifyPages]" cols="50" rows="5"><?=$pref['notifyPages']?></textarea>
+     &nbsp;<textarea name="pref[notifyPages]" cols="50" rows="5"><?=$pref->get('notifyPages')?></textarea>
      <p class="hint">(<?=_("Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed.")?>)</p>
    </p>
   <?php } else { ?>
-    <?=$pref['notifyPages']?>
+    <?=$pref->get('notifyPages')?>
   <?php } */ ?>
   <h2><?=_("Appearance")?></h2>
@@ -175,14 +170,14 @@ if ($errmsg) $msg = HTML(HTML::h4(array(
     <?php if ($isForm) { ?>
      <input type="text" name="pref[editHeight]" size="4" maxlength="4" class="numeric"
-            value="<?=$pref['editHeight']?>" />
+            value="<?=$pref->get('editHeight')?>" />
     <?php } else { ?>
-      <?=$pref['editHeight']?>
+      <?=$pref->get('editHeight')?>
     <?php } ?>
     <?=_("Width")?>
     <?php if ($isForm) { ?>
      <input type="text" name="pref[editWidth]" size="4" maxlength="4" class="numeric"
-            value="<?=$pref['editWidth']?>" />
+            value="<?=$pref->get('editWidth')?>" />
     <?php } else { ?>
-      <?=$pref['editWidth']?>
+      <?=$pref->get('editWidth')?>
     <?php } ?>
   </p>
@@ -208,5 +203,6 @@ if ($errmsg) $msg = HTML(HTML::h4(array(
 <?php if ($isForm) { ?>
   <hr />
-  <p><?=Button("submit:", _("Update Preferences"), 'wikiadmin')?><?=Button("submit:cancel", _("Cancel"), 'button')?></p>
+  <p><?=Button("submit:", _("Update Preferences"), 'wikiadmin')?>
+  <?=Button("submit:cancel", _("Cancel"), 'button')?></p>
 
 <?= HiddenInputs($request->getArgs(), false, array('pref')) ?>



