Changeset 6409

Timestamp:

08/19/08 16:18:54 (5 months ago)

Author:

simonmcmanus

Message:

cct - adding user permissions

Location:

Trunk/association/serversides/cctiddly/Trunk

Files:

• handle/register.php (modified) (1 diff)
• includes/db.mysql.php (modified) (2 diffs)
• tiddlers/normal/ccRegister.js (modified) (3 diffs)

Trunk/association/serversides/cctiddly/Trunk/handle/register.php

@@ -19 +19 @@
 {
         debug("username is available ".$data['username'], "params");
+        debug("count is ".count(db_record_select($tiddlyCfg['table']['user'],$data)), "params");
         echo count(db_record_select($tiddlyCfg['table']['user'],$data));
         exit;

Trunk/association/serversides/cctiddly/Trunk/includes/db.mysql.php

@@ -672 +672 @@
                 $sql_start = "SELECT * FROM ".$table." WHERE ";
 
-                while( (list($k,$v) = each($data)) )
-                {
                 $sql = "";
-                        debug("add var to SQL -".$k."  = ".$v, "params");
+                        while( (list($k,$v) = each($data)) )
+                {
+//                      debug("add var to SQL -".$k."  = ".$v, "params");
                         if (($v != '') || ($k=='workspace_name'))  // make sure we dont search on emtpy values unless its 
                                 $sql .= "`".db_format4SQL($k)."`='".db_format4SQL($v)."' and ";
                 }
-                debug("a".$sql, "params");
                 $sql= $sql_start.substr($sql,0,(strlen($sql)-4));               //remove last "and"
-                
-                debug("b".$sql, "params");
                 if($sql == $sql_start)
                 {
@@ -688 +685 @@
                 }
                 $sql .= $end;
-                debug($sql, "mysql");
                 $result = db_query($sql);
 

Trunk/association/serversides/cctiddly/Trunk/tiddlers/normal/ccRegister.js

@@ -35 +35 @@
 config.macros.register.doRegister=function(place, w){
         var me = config.macros.register;
+        if(w.formElem["reg_username"].value==''){
+                displayMessage("no username entered");
+        }
+
+        if(config.macros.ccRegister.emailValid(w.formElem["reg_mail"].value)){
+                displayMessage("invalid email");
+//              mail_space=document.getElementById('mail_error');
+//              mail_space.innerHTML="email ok";
+//              mail_space.setAttribute("class","inlineOk");
+        }else{
+                displayMessage("working email");
+//              mail_space=document.getElementById('mail_error');
+//              mail_space.innerHTML='not a valid email address ';
+//              mail_space.setAttribute("class","inlineError");
+                return false;
+        }
+        if(w.formElem["reg_password1"].value===''){
+                displayMessage("no first password was not entered");
+//              document.getElementById('pass1_error').innerHTML='Please enter a password';
+//              this.password1.setAttribute("class","inputError");
+                return false;
+        if(w.formElem["reg_password2"].value===''){
+                displayMessage("no second password was not entered");
+//              document.getElementById('pass2_error').innerHTML='Please enter a password';
+//              this.password2.setAttribute("class","inputError");
+                return false;
+
+        if(w.formElem["reg_password1"].value != w.formElem["reg_password2"].value ){                    
+                displayMessage("your passwords do not match");
+//              this.password1.setAttribute("class","inputError");
+//              document.getElementById('pass2_error').innerHTML='Please ensure both passwords match';
+//              this.password2.setAttribute("class","inputError");
+                return false;
+        }
+
+//      var submit=document.getElementById('registerAccountSubmit');
+//      submit.disabled=true;
+//      submit.setAttribute("class","buttonDisabled");
+//      document.getElementById('submitStatus').innerHTML='Please wait, your account is being created.';
+//      setTimeout(config.macros.ccRegister.registerCheckResp,3000);
+
         var loginResp=doHttp('POST',url+'/handle/register.php',"username="+w.formElem['reg_username'].value+"&reg_mail="+w.formElem['reg_mail'].value+"&password="+w.formElem['reg_password1'].value+"&password2="+w.formElem['reg_password2'].value,null,null,null,config.macros.register.registerCallback,params);
         w.addStep(me.step2Title,"attempting to register your account.") ;
@@ -48 +89 @@
         window.location=window.location;
         return true;
-
 }
 
@@ -54 +94 @@
         var params = {};
         params.w = w;
-        doHttp('POST',url+'/handle/register.php',"username=aaa"+w.formElem["reg_username"].value+"&free=1",null,null,null,config.macros.register.isUsernameAvailabeCallback,params);
+        doHttp('POST',url+'/handle/register.php',"username="+w.formElem["reg_username"].value+"&free=1",null,null,null,config.macros.register.isUsernameAvailabeCallback,params);
         return false;
 };