remove '?' when not using mobile view, validate & by switching to &

plugins/cas_auth_unl/views/default/account/forms/login.php

@@ -10,7 +10,7 @@
 	 */
 
 	if ($vars['config']->input['view'] == 'mobile') {
-		$viewmobile = 'view=mobile';
+		$viewmobile = '?view=mobile';
 	} else {
 		$viewmobile = '';
 	}
@@ -18,19 +18,19 @@
     $token = generate_action_token($ts); 
 ?>
     <div id="casOption">
-	    <a href="<?php echo $vars['url'] ?>action/login?usecas=yes&__elgg_ts=<?php echo $ts; ?>&__elgg_token=<?php echo $token; ?>&<?php echo $viewmobile;?>" id="casLogin">Login</a>
+	    <a href="<?php echo $vars['url'] ?>action/login?usecas=yes&amp;__elgg_ts=<?php echo $ts; ?>&amp;__elgg_token=<?php echo $token; ?><?php echo str_replace('?', '&amp;', $viewmobile);?>" id="casLogin">Login</a>
 	    <div class="loginMessage">
 	        with your My.UNL Account<br />
 	        <span>for Faculty, Staff and Students</span>
         </div>
     </div>
     <div id="elggOption">
-	    <a href="<?php echo $vars['url'] .'pg/login?'.$viewmobile?>" class="switchAction"></a>
+	    <a href="<?php echo $vars['url'] .'pg/login'.$viewmobile?>" class="switchAction"></a>
 	    <div class="optionMessage">
 	        Don't have a My.UNL Account?
 		    <ul>
-		        <li><a href="<?php echo $vars['url'] .'pg/login?'.$viewmobile?>" class="switchAction">Login</a></li>
-		        <li><a href="<?php echo $vars['url'] .'account/register.php?'.$viewmobile?>">Register</a></li>
+		        <li><a href="<?php echo $vars['url'] .'pg/login'.$viewmobile?>" class="switchAction">Login</a></li>
+		        <li><a href="<?php echo $vars['url'] .'account/register.php'.$viewmobile?>">Register</a></li>
 		    </ul>
 	    </div>
 	    <div class="elggLoginForm">
@@ -38,7 +38,7 @@
 	            $form_body = '<div class="element"><label>' . elgg_echo('username') .'</label>'. elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')) . '</div>';
 	            $form_body .= '<div class="element"><label>' . elgg_echo('password') .'</label>'. elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . '</div>';
 	            $form_body .= elgg_view('input/submit', array('value' => elgg_echo('login')));
-	            $form_body .= '<ul><li><a href="'. $vars['url'] .'account/register.php?'.$viewmobile.'">' . elgg_echo('register') . '</a></li> <li><a href="'. $vars['url'] .'account/forgotten_password.php?'.$viewmobile.'">' . elgg_echo('user:password:lost') . '</a></li></ul>';
+	            $form_body .= '<ul><li><a href="'. $vars['url'] .'account/register.php'.$viewmobile.'">' . elgg_echo('register') . '</a></li> <li><a href="'. $vars['url'] .'account/forgotten_password.php'.$viewmobile.'">' . elgg_echo('user:password:lost') . '</a></li></ul>';
 	            echo elgg_view('input/form', array('body' => $form_body, 'action' => "". $vars['url'] ."action/login"));
 	        ?>
 	    </div>