Changeset 6425

Timestamp:

08/20/08 15:11:08 (5 months ago)

Author:

simonmcmanus

Message:

cct - fixed login for ie7

Location:

Trunk/association/serversides/cctiddly/Trunk

Files:

• handle/login.php (deleted)
• handle/loginFile.php (added)
• includes/config.php (modified) (2 diffs)
• includes/debug.php (modified) (1 diff)
• tiddlers/normal/ccAdaptor.js (modified) (3 diffs)
• tiddlers/normal/ccLogin.js (modified) (2 diffs)

Trunk/association/serversides/cctiddly/Trunk/includes/config.php

@@ -17 +17 @@
 $tiddlyCfg['can_create_account'] = 1; // users are allowed to register for an account 
         
+        
 //LDAP
 
 $tiddlyCfg['pref']['ldap_server'] = '127.0.0.1';        
-$tiddlyCfg['pref']['ldap_enabled'] = 0; 
-$tiddlyCfg['pref']['ldap_username']     = "CN=";
-$tiddlyCfg['pref']['ldap_password'] = "";
-$tiddlyCfg['pref']['ldap_connection_string'] = "ldap://";
+$tiddlyCfg['pref']['ldap_enabled'] = 1; 
+$tiddlyCfg['pref']['ldap_username']     = "CN=Sa063338,OU=functional,OU=btplc,DC=iuser,DC=iroot,DC=adidom,DC=com";
+$tiddlyCfg['pref']['ldap_password'] = "pass9431w";
+$tiddlyCfg['pref']['ldap_connection_string'] = "ldap://iuser.iroot.adidom.com:389";
 
 //Deligated Session Managment 
@@ -98 +99 @@
 
 $tiddlyCfg['developing'] = 1;           //developing mode. If set to 2 will override debug setting below and output everything into the debug file. 
-$tiddlyCfg['debug']['mysql'] = 1;        // if set to x1 will output every sql query into the logfile 
+$tiddlyCfg['debug']['mysql'] = 0;        // if set to x1 will output every sql query into the logfile 
 $tiddlyCfg['debug']['login'] = 1;
 $tiddlyCfg['debug']['handle'] = 0;

Trunk/association/serversides/cctiddly/Trunk/includes/debug.php

@@ -6 +6 @@
 </form>';
 
-$file = file_get_contents('/Applications/xampp/xamppfiles/logs/error_log');
+$file = file_get_contents('C:\xampp\apache\logs\error.log');
 $lines = explode("\n", $file);
 $lines = array_reverse($lines);

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

@@ -23 +23 @@
 ccTiddlyAdaptor.doHttpGET = function(uri,callback,params,headers,data,contentType,username,password)
 {
-        return doHttp('GET',uri,data,contentType,username,password,callback,params,headers,1);
+        return doHttp('GET',uri,data,contentType,username,password,callback,params,headers);
 };
 
 ccTiddlyAdaptor.doHttpPOST = function(uri,callback,params,headers,data,contentType,username,password)
 {
-        return doHttp('POST',uri,data,contentType,username,password,callback,params,headers,1);
+        return doHttp('POST',uri,data,contentType,username,password,callback,params,headers);
 };
 
 ccTiddlyAdaptor.doHttpPUT = function(uri,callback,params,headers,data,contentType,username,password)
 {
-        return doHttp('PUT',uri,data,contentType,username,password,callback,params,headers,1);
+        return doHttp('PUT',uri,data,contentType,username,password,callback,params,headers);
 };
 
@@ -58 +58 @@
 //#console.log('login:'+context.username);
        context = this.setContext(context,userParams,callback);
-       var uriTemplate = '%0/handle/login.php?cctuser=%1&cctpass=%2';
+       var uriTemplate = '%0/handle/loginFile.php?cctuser=%1&cctpass=%2';
        var uri = uriTemplate.format([context.host,context.username,context.password]);
 //#console.log('uri:'+uri);
+displayMessage("uri : "+uri);
        var req = ccTiddlyAdaptor.doHttpGET(uri,ccTiddlyAdaptor.loginCallback,context);
        return typeof req == 'string' ? req : true;
@@ -67 +68 @@
 ccTiddlyAdaptor.loginCallback = function(status,context,responseText,uri,xhr)
 {
+        displayMessage(responseText);
 //#console.log('loginCallback:'+status);
        if(xhr.status==401) {

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

@@ -68 +68 @@
         configPasswordInputName:"cctpass",
         configPasswordCookieName:"cctPass",
-        sha1:true
+        sha1:false
 });
         
@@ -146 +146 @@
 }
 
-config.macros.ccLogin.loginCallback=function(context,userParams, responseText){
+config.macros.ccLogin.loginCallback=function(context,userParams){       
         if(context.status){
                 window.location=window.fullUrl;