Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8802] XoopsModules/smallworld/trunk/smallworld
|
From: <dj...@us...> - 2012-01-24 16:49:12
|
Revision: 8802
http://xoops.svn.sourceforge.net/xoops/?rev=8802&view=rev
Author: djculex
Date: 2012-01-24 16:49:01 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Trolls stole code changes... bringing back verification php array to javascript array
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/preloads/core.php
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-01-24 09:17:26 UTC (rev 8801)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-01-24 16:49:01 UTC (rev 8802)
@@ -172,72 +172,105 @@
xoops_smallworld(function() {
// Attact validation to registeration parts in register form
- if (smallworldvalidationstrenght != 0) {
+ if (smallworldvalidationstrenght != 0) {
xoops_smallworld("#smallworld_profileform-next-0").hide();
xoops_smallworld("#smallworld_profileform-next-1").hide();
+
+ if(xoops_smallworld.inArray('realname',smallworlduseverification) > -1) {
+ xoops_smallworld("input#realname").validate({
+ expression: "if (VAL) return true; else return false;",
+ message: SmallworldValidationNameErrorMsg,
+ });
+ }
+
+ if(xoops_smallworld.inArray('gender',smallworlduseverification) > -1) {
+ xoops_smallworld("select#gender").validate({
+ expression: "if (VAL != 0) return true; else return false;",
+ message: SmallworldValidationGenderErrorMsg
+ });
+ }
+
+ if(xoops_smallworld.inArray('interestedin',smallworlduseverification) > -1) {
+ xoops_smallworld("#intingender").validate({
+ expression: "if (isChecked(SelfID)) return true; else return false;",
+ message: SmallworldValidationIntingenderErrorMsg
+ });
+
+ }
+
+ if(xoops_smallworld.inArray('lookingfor',smallworlduseverification) > -1) {
+ xoops_smallworld("#searchrelat").validate({
+ expression: "if (isChecked(SelfID)) return true; else return false;",
+ message: SmallworldValidationSearchrelatErrorMsg
+ });
+ }
+
+ if(xoops_smallworld.inArray('emails',smallworlduseverification) > -1) {
+ xoops_smallworld('input[name="emailtype[]"]').live('blur',function(){
+ var id = xoops_smallworld(this).attr('id');
+ xoops_smallworld("#"+id).validate({
+ expression: "if (VAL.match(/^[^\\W][a-zA-Z0-9\\_\\-\\.]+([a-zA-Z0-9\\_\\-\\.]+)*\\@[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)*\\.[a-zA-Z]{2,4}$/)) return true; else return false;",
+ message:"<img src='images/error.png' title='"+SmallworldValidationEmailTitleErrorMsg+"'/>"
+ });
+ });
+ }
+
+ if(xoops_smallworld.inArray('birthday',smallworlduseverification) > -1) {
+ xoops_smallworld("input[name='birthday']").validate({
+ expression: "if (!isValidDate(parseInt(VAL.split('-')[2],10), parseInt(VAL.split('-')[1],10), parseInt(VAL.split('-')[0],10))) return false; else return true;",
+ message: SmallworldValidationBirthdayErrorMsg
+ });
+ }
+
+ if(xoops_smallworld.inArray('birthplace',smallworlduseverification) > -1) {
+ xoops_smallworld("#birthplace").validate({
+ expression: "if (VAL) return true; else return false;",
+ message: SmallworldValidationBirthplaceErrorMsg
+ });
+ }
- xoops_smallworld("input#realname").validate({
- expression: "if (VAL) return true; else return false;",
- message: SmallworldValidationNameErrorMsg,
- });
+ if(xoops_smallworld.inArray('birthplace',smallworlduseverification) > -1) {
+ xoops_smallworld("input#adress").validate({
+ expression: "if (VAL) return true; else return false;",
+ message: SmallworldValidationAdressErrorMsg
+ });
+ }
- xoops_smallworld("select#gender").validate({
- expression: "if (VAL != 0) return true; else return false;",
- message: SmallworldValidationGenderErrorMsg
- });
+ if(xoops_smallworld.inArray('presentcity',smallworlduseverification) > -1) {
+ xoops_smallworld("input#present_city").validate({
+ expression: "if (VAL) return true; else return false;",
+ message: SmallworldValidationCityErrorMsg
+ });
+ }
- xoops_smallworld("#intingender").validate({
- expression: "if (isChecked(SelfID)) return true; else return false;",
- message: SmallworldValidationIntingenderErrorMsg
- });
+ if(xoops_smallworld.inArray('country',smallworlduseverification) > -1) {
+ xoops_smallworld("input#present_country").validate({
+ expression: "if (VAL) return true; else return false;",
+ message: SmallworldValidationCountryErrorMsg
+ });
+ }
- xoops_smallworld("#searchrelat").validate({
- expression: "if (isChecked(SelfID)) return true; else return false;",
- message: SmallworldValidationSearchrelatErrorMsg
- });
- xoops_smallworld('input[name="emailtype[]"]').live('blur',function(){
- var id = xoops_smallworld(this).attr('id');
- xoops_smallworld("#"+id).validate({
- expression: "if (VAL.match(/^[^\\W][a-zA-Z0-9\\_\\-\\.]+([a-zA-Z0-9\\_\\-\\.]+)*\\@[a-zA-Z0-9_]+(\\.[a-zA-Z0-9_]+)*\\.[a-zA-Z]{2,4}$/)) return true; else return false;",
- message:"<img src='images/error.png' title='"+SmallworldValidationEmailTitleErrorMsg+"'/>"
+ if(xoops_smallworld.inArray('website',smallworlduseverification) > -1) {
+ xoops_smallworld("textarea#website").validate({
+ expression: "if (urlCheck(VAL)) return true; else return false;",
+ message: SmallworldValidationWebsiteErrorMsg
});
- });
+ }
- xoops_smallworld("input[name='birthday']").validate({
- expression: "if (!isValidDate(parseInt(VAL.split('-')[2],10), parseInt(VAL.split('-')[1],10), parseInt(VAL.split('-')[0],10))) return false; else return true;",
- message: SmallworldValidationBirthdayErrorMsg
- });
- xoops_smallworld("#birthplace").validate({
- expression: "if (VAL) return true; else return false;",
- message: SmallworldValidationBirthplaceErrorMsg
- });
-
- xoops_smallworld("input#adress").validate({
- expression: "if (VAL) return true; else return false;",
- message: SmallworldValidationAdressErrorMsg
- });
- xoops_smallworld("input#present_city").validate({
- expression: "if (VAL) return true; else return false;",
- message: SmallworldValidationCityErrorMsg
- });
- xoops_smallworld("input#present_country").validate({
- expression: "if (VAL) return true; else return false;",
- message: SmallworldValidationCountryErrorMsg
- });
- xoops_smallworld("textarea#website").validate({
- expression: "if (urlCheck(VAL)) return true; else return false;",
- message: SmallworldValidationWebsiteErrorMsg
- });
-
// Activation of validations to be filled on initial load
xoops_smallworld('fieldset:visible').find('input,select,textarea').each(function() {
xoops_smallworld(this).blur();
- });
+ });
}
- });
+
+ if (smallworlduseverification.length !=0) {
+ xoops_smallworld('#smallworld_profileform-next-0').show();
+ xoops_smallworld('#smallworld_profileform-next-1').show();
+ }
+ });
Modified: XoopsModules/smallworld/trunk/smallworld/preloads/core.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2012-01-24 09:17:26 UTC (rev 8801)
+++ XoopsModules/smallworld/trunk/smallworld/preloads/core.php 2012-01-24 16:49:01 UTC (rev 8802)
@@ -65,8 +65,9 @@
// Check to see if smallworld should use username links to point to default xoops or smallworld
$takeoverlinks = $moduleConfig['takeoveruserlinks'];
$fieldstoshow = array_flip(smallworld_GetModuleOption('smallworldusethesefields', $repmodule='smallworld'));
- $useverification = array_flip(smallworld_GetModuleOption('smallworldmandatoryfields', $repmodule='smallworld'));
+ $useverification = smallworld_GetModuleOption('smallworldmandatoryfields', $repmodule='smallworld');
$smallworldUV = implode(',', $useverification);
+ //echo var_dump($smallworldUV);
// Get users messages count based on users followerArray
$getUserMsgNum = smallworld_getCountFriendMessagesEtc ();
@@ -81,7 +82,9 @@
var smallworldTakeOverLinks = $takeoverlinks;
var geoL = $geolocate;
var geocomplete = '';
- var smallworlduseverification = new Array($smallworldUV);
+ var smallworldVerString = "$smallworldUV";
+ var smallworlduseverification = new Array();
+ smallworlduseverification = smallworldVerString.split(",");
var hasmessages = $count_invit;
var smallworldvalidationstrenght = $validate;
var smallworld_getFriendsMsgComCount = $getUserMsgNum;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
