Problems loading styles...

beaver-dev · beaver-dev · commit 206fabbe3f9b · 2016-02-25T19:53:54.000+01:00
diff --git a/featherbb/Controller/Admin/Groups.php b/featherbb/Controller/Admin/Groups.php
@@ -114,7 +114,6 @@ public function addedit($req, $res, $args)
                     'active_page' => 'admin',
                     'admin_console' => true,
                     'focus_element' => array('groups2', 'req_title'),
-                    'required_fields' => array('req_title' => __('Group title label')),
                     'group'    =>    $group,
                     'groups'    =>    $groups,
                     'id'    => $args['id'],
diff --git a/featherbb/Controller/Auth.php b/featherbb/Controller/Auth.php
@@ -67,7 +67,6 @@ public function login($req, $res, $args)
             View::setPageInfo(array(
                                 'active_page' => 'login',
                                 'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Login')),
-                                'required_fields' => array('req_username' => __('Username'), 'req_password' => __('Password')),
                                 'focus_element' => array('login', 'req_username'),
                                 )
                         )->addTemplate('login/form.php')->display();
@@ -153,7 +152,6 @@ public function forget($req, $res, $args)
 //                'errors'    =>    $this->model->password_forgotten(),
                 'active_page' => 'login',
                 'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Request pass')),
-                'required_fields' => array('req_email' => __('Email')),
                 'focus_element' => array('request_pass', 'req_email'),
             )
         )->addTemplate('login/password_forgotten.php')->display();
diff --git a/featherbb/Controller/Register.php b/featherbb/Controller/Register.php
@@ -58,7 +58,6 @@ public function display($req, $res, $args)
         View::setPageInfo(array(
                     'title' => array(Utils::escape(ForumSettings::get('o_board_title')), __('Register')),
                     'focus_element' => array('register', 'req_user'),
-                    'required_fields' => array('req_user' => __('Username'), 'req_password1' => __('Password'), 'req_password2' => __('Confirm pass'), 'req_email1' => __('Email'), 'req_email2' => __('Email').' 2', 'captcha' => __('Robot title')),
                     'active_page' => 'register',
                     'is_indexed' => true,
                     'errors' => $user['errors'],
diff --git a/featherbb/Core/Interfaces/Input.php b/featherbb/Core/Interfaces/Input.php
@@ -11,7 +11,7 @@ public static function getParam($key, $default = null, $sanitize = true)
 	{
 		$result = Request::getParam($key, $default);
 		if ($sanitize) {
-			$result = htmlspecialchars($result);
+			$result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
 			$result = trim($result);
 		}
 		return $result;
@@ -20,7 +20,7 @@ public static function post($key, $default = null, $sanitize = false)
 	{
 		$result = Request::getParsedBodyParam($key, $default);
 		if ($sanitize) {
-			$result = htmlspecialchars($result);
+			$result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
 			$result = trim($result);
 		}
 		return $result;
@@ -29,7 +29,7 @@ public static function query($key, $default = null, $sanitize = true)
 	{
 		$result = Request::getQueryParam($key, $default);
 		if ($sanitize) {
-			$result = htmlspecialchars($result);
+			$result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
 			$result = trim($result);
 		}
 		return $result;
diff --git a/featherbb/View/admin/groups/add_edit_group.php b/featherbb/View/admin/groups/add_edit_group.php
@@ -20,7 +20,7 @@
     <div class="blockform">
         <h2><span><?php _e('Group settings head') ?></span></h2>
         <div class="box">
-            <form id="groups2" method="post" action="" onsubmit="return process_form(this)">
+            <form id="groups2" method="post" action="">
                 <input type="hidden" name="csrf_name" value="<?= $csrf_name; ?>"><input type="hidden" name="csrf_value" value="<?= $csrf_value; ?>">
                 <p class="submittop"><input type="submit" name="add_edit_group" value="<?php _e('Save') ?>" /></p>
                 <div class="inform">
@@ -37,7 +37,7 @@
                                     <td>
                                         <input type="text" name="req_title" size="25" maxlength="50" value="<?php if ($group['mode'] == 'edit') {
     echo Utils::escape($group['info']['g_title']);
-} ?>" tabindex="1" />
+} ?>" tabindex="1" required />
                                     </td>
                                 </tr>
                                 <tr>
diff --git a/featherbb/View/header.php b/featherbb/View/header.php
@@ -255,3 +255,32 @@ function process_form(the_form)
     <?php
 endif;
 Container::get('hooks')->fire('view.header.end');
+?>
+<?php
+
+foreach($assets as $type => $items) {
+    if ($type == 'js') {
+        continue;
+    }
+    echo "\t".'<!-- '.ucfirst($type).' -->'."\n";
+    foreach ($items as $item) {
+        echo "\t".'<link ';
+        foreach ($item['params'] as $key => $value) {
+            echo $key.'="'.$value.'" ';
+        }
+        echo 'href="'.Url::base_static().'/'.$item['file'].'">'."\n";
+    }
+}
+if ($admin_console) {
+    if (file_exists(ForumEnv::get('FEATHER_ROOT').'style/themes/'.User::get()->style.'/base_admin.css')) {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base_static().'/style/themes/'.User::get()->style.'/base_admin.css" />'."\n";
+    } else {
+        echo "\t".'<link rel="stylesheet" type="text/css" href="'.Url::base_static().'/style/imports/base_admin.css" />'."\n";
+    }
+}
+if (!empty($page_head)) :
+    echo implode("\n", $page_head)."\n";
+endif;
+
+Container::get('hooks')->fire('view.header.before.head.tag');
+?>
diff --git a/featherbb/View/login/form.php b/featherbb/View/login/form.php
@@ -18,15 +18,15 @@
 <div class="blockform">
     <h2><span><?php _e('Login') ?></span></h2>
     <div class="box">
-        <form id="login" method="post" action="<?= Router::pathFor('login') ?>" onsubmit="return process_form(this)">
+        <form id="login" method="post" action="<?= Router::pathFor('login') ?>">
             <input type="hidden" name="csrf_name" value="<?= $csrf_name; ?>"><input type="hidden" name="csrf_value" value="<?= $csrf_value; ?>">
             <div class="inform">
                 <fieldset>
                     <legend><?php _e('Login legend') ?></legend>
                     <div class="infldset">
                         <input type="hidden" name="form_sent" value="1" />
-                        <label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" /><br /></label>
-                        <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" /><br /></label>
+                        <label class="conl required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_username" size="25" maxlength="25" tabindex="1" required /><br /></label>
+                        <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password" size="25" tabindex="2" required /><br /></label>
 
                         <div class="rbox clearb">
                             <label><input type="checkbox" name="save_pass" value="1" tabindex="3" checked="checked" /><?php _e('Remember me') ?><br /></label>
diff --git a/featherbb/View/login/password_forgotten.php b/featherbb/View/login/password_forgotten.php
@@ -41,14 +41,14 @@
 <div class="blockform">
     <h2><span><?php _e('Request pass') ?></span></h2>
     <div class="box">
-        <form id="request_pass" method="post" action="<?= Router::pathFor('resetPassword') ?>" onsubmit="this.request_pass.disabled=true;if(process_form(this)){return true;}else{this.request_pass.disabled=false;return false;}">
+        <form id="request_pass" method="post" action="<?= Router::pathFor('resetPassword') ?>">
             <input type="hidden" name="csrf_name" value="<?= $csrf_name; ?>"><input type="hidden" name="csrf_value" value="<?= $csrf_value; ?>">
             <div class="inform">
                 <fieldset>
                     <legend><?php _e('Request pass legend') ?></legend>
                     <div class="infldset">
                         <input type="hidden" name="form_sent" value="1" />
-                        <label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" /><br /></label>
+                        <label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br /><input id="req_email" type="text" name="req_email" size="50" maxlength="80" required /><br /></label>
                         <p><?php _e('Request pass info') ?></p>
                     </div>
                 </fieldset>
diff --git a/featherbb/View/register/form.php b/featherbb/View/register/form.php
@@ -43,7 +43,7 @@
 <div id="regform" class="blockform">
     <h2><span><?php _e('Register') ?></span></h2>
     <div class="box">
-        <form id="register" method="post" action="" onsubmit="this.register.disabled=true;if(process_form(this)){return true;}else{this.register.disabled=false;return false;}">
+        <form id="register" method="post" action="">
         <input type="hidden" name="csrf_name" value="<?= $csrf_name; ?>"><input type="hidden" name="csrf_value" value="<?= $csrf_value; ?>">
             <div class="inform">
                 <div class="forminfo">
@@ -57,40 +57,36 @@
                         <input type="hidden" name="form_sent" value="1" />
                         <input type="hidden" name="username" value="" />
                         <input type="hidden" name="password" value="" />
-                        <label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?php if (Input::post('req_user')) {
-    echo Utils::escape(Input::post('req_user'));
-} ?>" size="25" maxlength="25" /><br /></label>
+                        <label class="required"><strong><?php _e('Username') ?> <span><?php _e('Required') ?></span></strong><br /><input type="text" name="req_user" value="<?= Input::post('req_user'); ?>" size="25" maxlength="25" required /><br /></label>
                     </div>
                 </fieldset>
             </div>
-<?php if (ForumSettings::get('o_regs_verify') == '0'): ?>            <div class="inform">
+<?php if (ForumSettings::get('o_regs_verify') == '0'): ?>
+            <div class="inform">
                 <fieldset>
                     <legend><?php _e('Pass legend') ?></legend>
                     <div class="infldset">
-                        <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?php if (Input::post('req_password1')) {
-    echo Utils::escape(Input::post('req_password1'));
-} ?>" size="16" /><br /></label>
-                        <label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?php if (Input::post('req_password2')) {
-    echo Utils::escape(Input::post('req_password2'));
-} ?>" size="16" /><br /></label>
+                        <label class="conl required"><strong><?php _e('Password') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password1" value="<?= Input::post('req_password1') ?>" size="16" required /><br /></label>
+                        <label class="conl required"><strong><?php _e('Confirm pass') ?> <span><?php _e('Required') ?></span></strong><br /><input type="password" name="req_password2" value="<?= Input::post('req_password2'); ?>" size="16" required /><br /></label>
                         <p class="clearb"><?php _e('Pass info') ?></p>
                     </div>
                 </fieldset>
             </div>
-<?php endif; ?>            <div class="inform">
+<?php endif; ?>
+            <div class="inform">
                 <fieldset>
                     <legend><?php echo(ForumSettings::get('o_regs_verify') == '1') ? __('Email legend 2') : __('Email legend') ?></legend>
                     <div class="infldset">
-<?php if (ForumSettings::get('o_regs_verify') == '1'): ?>                        <p><?php _e('Email info') ?></p>
-<?php endif; ?>                        <label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
-                        <input type="text" name="req_email1" value="<?php if (Input::post('req_email1')) {
-    echo Utils::escape(Input::post('req_email1'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php if (ForumSettings::get('o_regs_verify') == '1'): ?>                        <label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
-                        <input type="text" name="req_email2" value="<?php if (Input::post('req_email2')) {
-    echo Utils::escape(Input::post('req_email2'));
-} ?>" size="50" maxlength="80" /><br /></label>
-<?php endif; ?>                    </div>
+<?php if (ForumSettings::get('o_regs_verify') == '1'): ?>
+                        <p><?php _e('Email info') ?></p>
+<?php endif; ?>
+                       <label class="required"><strong><?php _e('Email') ?> <span><?php _e('Required') ?></span></strong><br />
+                        <input type="email" name="req_email1" value="<?= Input::post('req_email1'); ?>" size="50" maxlength="80" required /><br /></label>
+<?php if (ForumSettings::get('o_regs_verify') == '1'): ?>
+                        <label class="required"><strong><?php _e('Confirm email') ?> <span><?php _e('Required') ?></span></strong><br />
+                        <input type="email" name="req_email2" value="<?= Input::post('req_email2'); ?>" size="50" maxlength="80" required /><br /></label>
+<?php endif; ?>
+                    </div>
                 </fieldset>
             </div>
 <?php
@@ -128,7 +124,7 @@
                     <legend><?php _e('Robot title') ?></legend>
                     <div class="infldset">
                         <p><?php _e('Robot info')    ?></p>
-                        <label class="required"><strong><?= sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" /><input name="captcha_q" value="<?= $qencoded ?>" type="hidden" /></label>
+                        <label class="required"><strong><?= sprintf(__('Robot question'), $question[$index_questions]) ?> <span><?php _e('Required') ?></span></strong><br /><input name="captcha" id="captcha" type="text" size="10" maxlength="30" required /><input name="captcha_q" value="<?= $qencoded ?>" type="hidden" /></label>
                     </div>
                 </fieldset>
             </div>
diff --git a/plugins/fluid-nav/pjax-standalone.js b/plugins/fluid-nav/pjax-standalone.js
@@ -19,7 +19,8 @@
 		// Attempt to check that a device supports pushstate before attempting to use it.
 		"is_supported": window.history && window.history.pushState && window.history.replaceState && !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]|WebApps\/.+CFNetwork)/),
 		// Track which scripts have been included in to the page. (used if e)
-		"loaded_scripts": []
+		"loaded_scripts": [],
+		"loaded_styles": []
 	};
 
 	// If PJAX isn't supported we can skip setting up the library all together
@@ -257,6 +258,14 @@
 				}
 			}
 
+			// Store array or all currently included stylesheets href's
+			// var links = document.getElementsByTagName('link');
+			// for(var c=0; c < links.length; c++) {
+			// 	if(links[c].href && internal.loaded_styles.indexOf(links[c].src) === -1 && links[c].rel === 'stylesheet'){
+			// 		internal.loaded_styles.push(links[c].href);
+			// 	}
+			// }
+
 			// Fire ready event once all links are connected
 			internal.triggerEvent(internal.get_container_node(options.container), 'ready');
 
@@ -372,27 +381,20 @@
 	 * return void
 	 */
 	internal.addStyles = function(html){
-		return;
-        // console.log(document.styleSheets[0]);
-		// Extract JavaScript & eval it (if enabled)
-		// var stylesheets = html.getElementsByTagName('link').filter(function(link){
-        //     return link.getAttribute('rel') == 'stylesheet';
-        // });
-        // console.log(stylesheets);
-		// for(var sc=0; sc < scripts.length;sc++) {
-		// 	// If has an src & src isn't in "loaded_scripts", load the script.
-		// 	if(scripts[sc].src && internal.loaded_scripts.indexOf(scripts[sc].src) === -1){
-		// 		// Append to head to include
-		// 		var s = document.createElement("script");
-		// 		s.src = scripts[sc].src;
-		// 		document.head.appendChild(s);
-		// 		// Add to loaded list
-		// 		internal.loaded_scripts.push(scripts[sc].src);
-		// 	}else{
-		// 		// If raw JS, eval it.
-		// 		eval(scripts[sc].innerHTML);
-		// 	}
-		// }
+		// Extract stylesheets and load them
+		var styles = document.getElementsByTagName('link');
+		for(var ss=0; ss < styles.length;ss++) {
+			console.log(styles[ss].href);
+			// If has an src & src isn't in "loaded_ssripts", load the ssript.
+			// if(styles[ss].href && internal.loaded_styles.indexOf(styles[ss].href) === -1 && styles[ss].rel === 'stylesheet'){
+			// 	// Append to head to include
+			// 	var s = document.createElement("link");
+			// 	s.href = styles[ss].href;
+			// 	// document.head.appendChild(s);
+			// 	// Add to loaded list
+			// 	// internal.loaded_styles.push(styles[ss].href);
+			// }
+		}
 	};
 
 	/**
@@ -575,6 +577,8 @@
 				case 'input':
 				switch (formElement.type) {
 					case 'text':
+					case 'number':
+					case 'email':
 					case 'hidden':
 					case 'password':
 					case 'button': // Not submitted when submitting form manually, though jQuery does serialize this and it can be an HTML4 successful control

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public static function getParam($key, $default = null, $sanitize = true)`
`11`	`11`	`{`
`12`	`12`	`$result = Request::getParam($key, $default);`
`13`	`13`	`if ($sanitize) {`
`14`		`- $result = htmlspecialchars($result);`
	`14`	`+ $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');`
`15`	`15`	`$result = trim($result);`
`16`	`16`	`}`
`17`	`17`	`return $result;`
`@@ -20,7 +20,7 @@ public static function post($key, $default = null, $sanitize = false)`
`20`	`20`	`{`
`21`	`21`	`$result = Request::getParsedBodyParam($key, $default);`
`22`	`22`	`if ($sanitize) {`
`23`		`- $result = htmlspecialchars($result);`
	`23`	`+ $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');`
`24`	`24`	`$result = trim($result);`
`25`	`25`	`}`
`26`	`26`	`return $result;`
`@@ -29,7 +29,7 @@ public static function query($key, $default = null, $sanitize = true)`
`29`	`29`	`{`
`30`	`30`	`$result = Request::getQueryParam($key, $default);`
`31`	`31`	`if ($sanitize) {`
`32`		`- $result = htmlspecialchars($result);`
	`32`	`+ $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');`
`33`	`33`	`$result = trim($result);`
`34`	`34`	`}`
`35`	`35`	`return $result;`