";
/*
diff --git a/e107_core/bbcodes/html.bb b/e107_core/bbcodes/html.bb
index 907026ea9..c4dbdc05d 100644
--- a/e107_core/bbcodes/html.bb
+++ b/e107_core/bbcodes/html.bb
@@ -1,3 +1,3 @@
-//$code_text = str_replace("\r\n", " ", $code_text);
-//$code_text = html_entity_decode($code_text, ENT_QUOTES, CHARSET);
+$code_text = str_replace("\r\n", " ", $code_text);
+$code_text = html_entity_decode($code_text, ENT_QUOTES, CHARSET);
return $code_text;
diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php
index 5d1372987..81d9703a4 100644
--- a/e107_core/shortcodes/batch/bbcode_shortcodes.php
+++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php
@@ -54,6 +54,18 @@ class bbcode_shortcodes extends e_shortcode
return $text;
}
+ function bb_newpage($id)
+ {
+ // $data = "[table]\n[tr]\n\t[td]Cell 1[/td]\n\t[td]Cell 2[/td]\n[/tr]\n[/table]"; // works with jquery, but not onclick.
+ $data = "[newpage]";
+ $event = $this->getEvent('addtext',$data,LANHELP_34,1);
+ $text = "";
+ $text .= "";
+ return $text;
+ }
+
+
+
function bb_list($id)
{
@@ -149,6 +161,7 @@ class bbcode_shortcodes extends e_shortcode
function bb_fontcol($id)
{
+ return '';
// $bbcode['fontcol'] = array("e-expandit","col_selector_".$rand, LANHELP_21,"fontcol.png","Color_Select",'col_selector_'.$rand);
$formid = $id."_";
diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml
index cba1fc6ee..c0f6423a4 100644
--- a/e107_core/xml/default_install.xml
+++ b/e107_core/xml/default_install.xml
@@ -158,9 +158,11 @@
310
- 1
+ 0
+ 01
- 1
+ 0
+ 040
diff --git a/e107_files/jslib/core/all.jquery.js b/e107_files/jslib/core/all.jquery.js
index cf0e3f11a..192467e2e 100644
--- a/e107_files/jslib/core/all.jquery.js
+++ b/e107_files/jslib/core/all.jquery.js
@@ -63,7 +63,7 @@ $(document).ready(function()
// Tabs
$(function() {
- $( "#tab-container" ).tabs();
+ $( "#tab-container" ).tabs({cache: true});
});
// Tabs
@@ -71,6 +71,52 @@ $(document).ready(function()
$( ".e-tabs" ).tabs();
});
+ $('.e-tabs-add').on("click", function(){
+ var url = $(this).attr('data-url');
+ var count = parseInt($("#e-tab-count").val()) + 1;
+
+ // alert(count);
+ //return false;
+ if($("#tab-container").tabs("add",url + '?iframe=1',"Page "+count))
+ {
+ $("#e-tab-count").val(count);
+ }
+
+ return false;
+ });
+
+ $('.e-email').on('blur', function() {
+ // alert('hello');
+ $(this).mailcheck({
+
+ suggested: function(element, suggestion) {
+ var id = $(element);
+ var hint = $(element).next('div').attr('data-hint');
+ var mes = hint.replace('[x]',suggestion.full);
+ $(element).next('div').html(mes);
+ $(element).next('div').show('slow');
+ },
+ empty: function(element) {
+ $(element).next('div').hide('slow');
+ }
+ });
+ });
+
+ $('.e-password').on('keyup', function() {
+ // var len = $(this).val().length;
+
+ //data-minlength
+ });
+
+
+
+
+
+ // var tabs = $('#tab-container').clone(true);
+ // $('#htmlEditor').append(tabs);
+
+
+
/*
$("a.e-bb").click(function(){
var add = $(this).attr('data-bbcode');
@@ -143,7 +189,7 @@ $(document).ready(function()
// Password
$(function() {
- $("#password1").pwdMeter({
+ $(".e-password-admin").pwdMeter({
minLength: 6,
displayGeneratePassword: true,
generatePassText: "Generate",
diff --git a/e107_files/jslib/password/jquery.pwdMeter.js b/e107_files/jslib/password/jquery.pwdMeter.js
index 9763d5a78..dcf3bedb2 100644
--- a/e107_files/jslib/password/jquery.pwdMeter.js
+++ b/e107_files/jslib/password/jquery.pwdMeter.js
@@ -94,7 +94,7 @@ jQuery.fn.pwdMeter = function(options){
var randomPassword = random_password();
$('#Spn_NewPassword').text(randomPassword);
$(options.passwordBox).val(randomPassword);
- alert(randomPassword);
+ // alert(randomPassword);
evaluateMeter();
});
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 7235036f4..2de1fcc9b 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -110,6 +110,14 @@ class e_form
//never allow id in format name-value for text fields
return "get_attributes($options, $name)." />";
}
+
+ function email($name, $value, $maxlength = 200, $options = array())
+ {
+ $options = $this->format_options('text', $name, $options);
+ //never allow id in format name-value for text fields
+ return "get_attributes($options, $name)." />
+ ";
+ }
function iconpreview($id, $default, $width='', $height='') // FIXME
{
@@ -582,9 +590,11 @@ class e_form
function password($name, $value = '', $maxlength = 50, $options = array())
{
+
$options = $this->format_options('text', $name, $options);
+ $options['class'] = vartrue($options['class'],'e-password');
//never allow id in format name-value for text fields
- return "get_attributes($options, $name)." />";
+ return "get_attributes($options, $name)." />";
}
// autoexpand done
@@ -1048,6 +1058,18 @@ class e_form
case 'disabled':
if($optval) $ret .= " disabled='disabled'";
break;
+
+ case 'required':
+ if($optval) $ret .= " required='required'";
+ break;
+
+ case 'placeholder':
+ if($optval) $ret .= " placeholder='{$optval}'";
+ break;
+
+ case 'pattern':
+ if($optval) $ret .= " pattern='{$optval}'";
+ break;
case 'other':
if($optval) $ret .= " $optval";
@@ -1133,9 +1155,12 @@ class e_form
'selected' => false,
'checked' => false,
'disabled' => false,
+ 'required' => false,
// 'multiple' => false, - see case 'select'
'tabindex' => 0,
'label' => '',
+ 'placeholder' => '',
+ 'pattern' => '',
'other' => ''
);
diff --git a/e107_plugins/facebook/e_module.php b/e107_plugins/facebook/e_module.php
index 354744cef..6dd3f5231 100644
--- a/e107_plugins/facebook/e_module.php
+++ b/e107_plugins/facebook/e_module.php
@@ -1,143 +1,46 @@
-register('logout',array('e_facebook','fb_logout'),e_PLUGIN.'facebook/facebook_function.php');
- global $fb;
-
- $fb = e107::getSingleton('e_facebook',e_PLUGIN.'facebook/facebook_function.php');
- include_once (e_PLUGIN.'facebook/facebook_function.php');
-
- if (function_exists('prevent_cache_headers'))
- {
- prevent_cache_headers();
- }
-
- define('XMLNS', "xmlns:fb='http://www.facebook.com/2008/fbml'");
-
- global $pref;
-
- if ($pref['disable_emailcheck'] == 0) // Ensure "Make entering an email address optional" is setted to "ON";
- {
- $pref['disable_emailcheck'] = 1;
- save_prefs();
- }
-
- if (e_QUERY == 'facebook') // when clicked it inserts a new User in e107.
- {
- Fb_Connect_Me();
- }
-
- if (e_QUERY == 'login') // simple Re-Login after logged out from e107
- {
- $fb->fb_login(); // Fb_LogIn();
- }
-
- if (e_QUERY == 'logout') // simulate Facebook logOut when logged out from e107
- {
- // Fb_LogOut();
- }
-
- if (e_QUERY == 'facebook_switch')
- {
- Switch_Facebook_User();
- }
-
- if (USERID && (e_QUERY == 'facebook_link') && $fb->fb_uid) //
- {
- // $fb->Add_Facebook_Connect_User('', USERID);
- $fb->addFacebookUser();
- }
-
- if (e_QUERY == 'facebook_delete')
- {
-
- Delete_Duplicate_Facebook_User();
-
- }
-
-
- function theme_foot()
- {
- global $fb;
- /**
- * the init js needs to be at the bottom of the document, within the
tag
- * this is so that any xfbml elements are already rendered by the time the xfbml
- * rendering takes over. otherwise, it might miss some elements in the doc.
- *
- */
-
- global $onload_js;
-
- $text .= render_facebook_init_js($fb->fb_uid);
- // Print out all onload function calls
-
- if ($onload_js)
- {
-
- $text .= '
![](".e_IMAGE_ABS."bbcode/newpage.png)