Changeset 3308
- Timestamp:
- 09/29/10 17:00:23 (14 years ago)
- Location:
- branches/2.2/jabberit_messenger/jmessenger
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/jabberit_messenger/jmessenger/js/AddUser.js
r3260 r3308 77 77 if( jidFrom != jidTo ) 78 78 { 79 TrophyIM.setAutorization( jidTo, jidFrom, 'subscribe' ); 80 79 81 TrophyIM.addContact( jidTo, name, group ); 80 82 } … … 114 116 115 117 TrophyIM.addContact( jidTo, name, group ); 118 119 TrophyIM.setAutorization( jidTo, jidFrom, 'subscribe' ); 116 120 117 121 _winBuild("new_user_jabberit","remove"); -
branches/2.2/jabberit_messenger/jmessenger/js/AddUser.mini.js
r3260 r3308 10 10 else 11 11 {var jidFrom=Base64.decode(loadscript.getUserCurrent().jid);var jidTo=getElement('user_jid_jabberIM').value;var name=getElement('user_name_jabberIM').value;var group=getElement('user_group_jabberIM').value;_winBuild('add_user_info','remove');if(jidFrom!=jidTo) 12 {TrophyIM. addContact(jidTo,name,group);}}}12 {TrophyIM.setAutorization(jidTo,jidFrom,'subscribe');TrophyIM.addContact(jidTo,name,group);}}} 13 13 function addNewUser() 14 14 {var name=getElement('name_new_user_jabberit').value;var group=getElement('name_group_new_user_jabberit').value;var jidFrom=getElement('jidFrom_new_user_jabberit').value;var jidTo=getElement('jidTo_new_user_jabberit').value;if((name=name.replace(/^\s+|\s+$|^\n|\n$/g,""))=="") … … 17 17 group="";if(group==null||group=="") 18 18 group="";if(jidFrom!=jidTo) 19 {TrophyIM.rosterObj.removeContact(jidTo);loadscript.removeElement(getElement('itenContact_'+jidTo));loadscript.removeElement(getElement('span_show_itenContact_'+jidTo));loadscript.removeElement(getElement('itenContactNotification_'+jidTo));TrophyIM.addContact(jidTo,name,group); _winBuild("new_user_jabberit","remove");}}19 {TrophyIM.rosterObj.removeContact(jidTo);loadscript.removeElement(getElement('itenContact_'+jidTo));loadscript.removeElement(getElement('span_show_itenContact_'+jidTo));loadscript.removeElement(getElement('itenContactNotification_'+jidTo));TrophyIM.addContact(jidTo,name,group);TrophyIM.setAutorization(jidTo,jidFrom,'subscribe');_winBuild("new_user_jabberit","remove");}} 20 20 function getElement(elementId) 21 21 {return document.getElementById(elementId);} -
branches/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js
r3264 r3308 370 370 try 371 371 { 372 var _divPhoto = getElement( jid + '__photo' ); 373 374 if( _divPhoto.style.backgroundImage.indexOf('photo.png') > 0 ) 375 { 376 var _imgUser = path_jabberit + 'inc/WebService.php?' + Date.parse( new Date ); 377 _imgUser += '&photo_ldap=' + jid; 378 379 _divPhoto.style.backgroundImage = 'url(' + _imgUser + ')'; 380 } 381 } 382 catch(e) 383 {} 372 var _divPhoto = getElement( jid + '__photo' ); 373 374 if( _divPhoto.style.backgroundImage.indexOf('photo.png') > 0 ) 375 { 376 var _imgUser = path_jabberit + 'inc/WebService.php?' + Date.parse( new Date ); 377 _imgUser += '&photo_ldap=' + jid; 378 379 _divPhoto.style.backgroundImage = 'url(' + _imgUser + ')'; 380 } 381 }catch(e){} 384 382 } 385 383 … … 416 414 String = String.replace( /\*\*@#%/g , " <img src='"+path_jabberit+"templates/default/images/smiles/14.gif'/> "); 417 415 String = String.replace( /\(I\)/g , " <img src='"+path_jabberit+"templates/default/images/smiles/15.gif'/> "); 416 String = String.replace( /C28I/g , " <img src='"+path_jabberit+"templates/default/images/smiles/16.gif'/> "); 418 417 419 418 return String; … … 507 506 searchUser( element.value ); 508 507 else 509 alert( 'Your search argument must be longer than 3 characters.');508 alert( i18n.YOUR_SEARCH_ARGUMENT_MUST_BE_LONGER_THAN_3_CHARACTERS + '.' ); 510 509 } 511 510 } … … 884 883 case 'from': 885 884 886 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribed');885 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribe'); 887 886 break; 888 887 889 888 case 'subscribe' : 890 889 891 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribed');890 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribed'); 892 891 break; 893 892 894 893 case 'none' : 895 894 896 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribe');895 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribe'); 897 896 break; 898 897 899 898 case 'to' : 900 899 901 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribed');900 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid ), 'subscribed'); 902 901 removeElement( getElement('itenContactNotification_' + jidTo ) ); 903 902 break; … … 905 904 case 'not-in-roster': 906 905 907 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe ');906 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed'); 908 907 addUser.add( jidTo ); 909 908 break; 910 911 default:912 913 alert( "UNDEFINED : " + subscription );914 909 } 915 910 } -
branches/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.mini.js
r3264 r3308 87 87 {try 88 88 {var _divPhoto=getElement(jid+'__photo');if(_divPhoto.style.backgroundImage.indexOf('photo.png')>0) 89 {var _imgUser=path_jabberit+'inc/WebService.php?'+Date.parse(new Date);_imgUser+='&photo_ldap='+jid;_divPhoto.style.backgroundImage='url('+_imgUser+')';}} 90 catch(e) 91 {}} 89 {var _imgUser=path_jabberit+'inc/WebService.php?'+Date.parse(new Date);_imgUser+='&photo_ldap='+jid;_divPhoto.style.backgroundImage='url('+_imgUser+')';}}catch(e){}} 92 90 function getShowContactsOffline() 93 91 {if(_preferencesIM[3]) … … 97 95 return true;} 98 96 function getSmiles(String) 99 {String=String.replace(/:\)|:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/1.gif'/> ");String=String.replace(/:-D/g," <img src='"+path_jabberit+"templates/default/images/smiles/2.gif'/> ");String=String.replace(/;-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/3.gif'/> ");String=String.replace(/=-O/g," <img src='"+path_jabberit+"templates/default/images/smiles/4.gif'/> ");String=String.replace(/:P/g," <img src='"+path_jabberit+"templates/default/images/smiles/5.gif'/> ");String=String.replace(/8-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/6.gif'/> ");String=String.replace(/\>:o/g," <img src='"+path_jabberit+"templates/default/images/smiles/7.gif'/> ");String=String.replace(/:-\$/g," <img src='"+path_jabberit+"templates/default/images/smiles/8.gif'/> ");String=String.replace(/:s|:-X/g," <img src='"+path_jabberit+"templates/default/images/smiles/9.gif'/> ");String=String.replace(/:-\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/10.gif'/> ");String=String.replace(/:\'\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/11.gif'/> ");String=String.replace(/:\|/g," <img src='"+path_jabberit+"templates/default/images/smiles/12.gif'/> ");String=String.replace(/O:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/13.gif'/> ");String=String.replace(/\*\*@#%/g," <img src='"+path_jabberit+"templates/default/images/smiles/14.gif'/> ");String=String.replace(/\(I\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/15.gif'/> "); return String;}97 {String=String.replace(/:\)|:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/1.gif'/> ");String=String.replace(/:-D/g," <img src='"+path_jabberit+"templates/default/images/smiles/2.gif'/> ");String=String.replace(/;-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/3.gif'/> ");String=String.replace(/=-O/g," <img src='"+path_jabberit+"templates/default/images/smiles/4.gif'/> ");String=String.replace(/:P/g," <img src='"+path_jabberit+"templates/default/images/smiles/5.gif'/> ");String=String.replace(/8-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/6.gif'/> ");String=String.replace(/\>:o/g," <img src='"+path_jabberit+"templates/default/images/smiles/7.gif'/> ");String=String.replace(/:-\$/g," <img src='"+path_jabberit+"templates/default/images/smiles/8.gif'/> ");String=String.replace(/:s|:-X/g," <img src='"+path_jabberit+"templates/default/images/smiles/9.gif'/> ");String=String.replace(/:-\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/10.gif'/> ");String=String.replace(/:\'\(/g," <img src='"+path_jabberit+"templates/default/images/smiles/11.gif'/> ");String=String.replace(/:\|/g," <img src='"+path_jabberit+"templates/default/images/smiles/12.gif'/> ");String=String.replace(/O:-\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/13.gif'/> ");String=String.replace(/\*\*@#%/g," <img src='"+path_jabberit+"templates/default/images/smiles/14.gif'/> ");String=String.replace(/\(I\)/g," <img src='"+path_jabberit+"templates/default/images/smiles/15.gif'/> ");String=String.replace(/C28I/g," <img src='"+path_jabberit+"templates/default/images/smiles/16.gif'/> ");return String;} 100 98 function getStatusUserIM() 101 99 {return statusUserIM;} … … 125 123 if(element.value.length>=3) 126 124 searchUser(element.value);else 127 alert( 'Your search argument must be longer than 3 characters.');}}125 alert(i18n.YOUR_SEARCH_ARGUMENT_MUST_BE_LONGER_THAN_3_CHARACTERS+'.');}} 128 126 function loginPage() 129 127 {var paramsLoginPage={'username':(((Base64.decode(getUserCurrent().jid)))?Base64.decode(getUserCurrent().jid):""),'password':(((Base64.decode(getUserCurrent().password)))?Base64.decode(getUserCurrent().password):"")} … … 197 195 if(divItenContact) 198 196 {var subscription=divItenContact.getAttribute('subscription');switch(subscription) 199 {case'from':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribe d');break;case'subscribe':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribed');break;case'none':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribe');break;case'to':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribed');removeElement(getElement('itenContactNotification_'+jidTo));break;case'not-in-roster':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribe');addUser.add(jidTo);break;default:alert("UNDEFINED : "+subscription);}}}197 {case'from':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribe');break;case'subscribe':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribed');break;case'none':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribe');break;case'to':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribed');removeElement(getElement('itenContactNotification_'+jidTo));break;case'not-in-roster':TrophyIM.setAutorization(jidTo,Base64.decode(this.getUserCurrent().jid),'subscribed');addUser.add(jidTo);break;}}} 200 198 function setMessageStatus() 201 199 {if(arguments.length>0) -
branches/2.2/jabberit_messenger/jmessenger/js/trophyim.js
r3264 r3308 159 159 _timeOut : { renderRoster : null }, 160 160 161 162 /** Remove Contact ( type = set ) 163 * 164 * 165 */ 166 167 removeResult : { idResult : [] }, 168 161 169 /** Function: setCookie 162 170 * … … 611 619 TrophyIM.connection.send( _iq.tree()); 612 620 } 613 621 614 622 return true; 615 623 }, … … 632 640 if( msg.getAttribute('from').toString().indexOf( TROPHYIM_CHATROOM ) < 0 ) 633 641 { 634 635 } 636 637 642 TrophyIM.rosterObj.setPresence( msg.getAttribute('from'), priority, show, status ); 643 } 644 645 return true; 638 646 }, 639 647 … … 1326 1334 // Remove Contact 1327 1335 var _id = TrophyIM.connection.getUniqueId(); 1328 var delContact = $iq({type: 'set', id: _id}) 1336 1337 // Controller Result 1338 //TrophyIM.removeResult.idResult[ TrophyIM.removeResult.idResult.length ] = jidTo; 1339 1340 var delContact = $iq({type: 'set', id: _id}) 1329 1341 delContact = delContact.c('query').attrs({xmlns : 'jabber:iq:roster'}); 1330 1342 delContact = delContact.c('item').attrs({jid: jidTo, subscription:'remove'}).tree(); … … 2189 2201 var jid_lower = barejid.toLowerCase(); 2190 2202 2191 if( show != 'unavailable' || show != 'error' )2192 { 2193 2203 if( show !== 'unavailable' || show !== 'error' ) 2204 { 2205 if (!this.roster[jid_lower]) 2194 2206 { 2195 2207 this.addContact( barejid, 'not-in-roster' ); -
branches/2.2/jabberit_messenger/jmessenger/js/trophyim.mini.js
r3264 r3308 13 13 return renderObj;},getHTML:function(page) 14 14 {return this.xmlParse(HTMLSnippets[page]);},getScript:function(script) 15 {var newscript=document.createElement('script');newscript.setAttribute('src',script);newscript.setAttribute('type','text/javascript');return newscript;}};TrophyIM={controll:{notificationNewUsers:0},autoConnection:{connect:true},activeChatRoom:{name:[]},chatHistory:{},constants:{stale_roster:false},posWindow:{left:400,top:100},statusConn:{connected:false},_timeOut:{renderRoster:null}, setCookie:function(name,value)15 {var newscript=document.createElement('script');newscript.setAttribute('src',script);newscript.setAttribute('type','text/javascript');return newscript;}};TrophyIM={controll:{notificationNewUsers:0},autoConnection:{connect:true},activeChatRoom:{name:[]},chatHistory:{},constants:{stale_roster:false},posWindow:{left:400,top:100},statusConn:{connected:false},_timeOut:{renderRoster:null},removeResult:{idResult:[]},setCookie:function(name,value) 16 16 {var expire=new Date();expire.setDate(expire.getDate()+365);document.cookie=name+"="+value+"; expires="+expire.toGMTString();},delCookie:function(name) 17 17 {var expire=new Date();expire.setDate(expire.getDate()-365);document.cookie=name+"= ; expires="+expire.toGMTString();delete TrophyIM.cookies[name];},getCookies:function() … … 402 402 delete this.roster[jid];}} 403 403 this.setPresence=function(fulljid,priority,show,status) 404 {var barejid=Strophe.getBareJidFromJid(fulljid);var resource=Strophe.getResourceFromJid(fulljid);var jid_lower=barejid.toLowerCase();if(show!= 'unavailable'||show!='error')404 {var barejid=Strophe.getBareJidFromJid(fulljid);var resource=Strophe.getResourceFromJid(fulljid);var jid_lower=barejid.toLowerCase();if(show!=='unavailable'||show!=='error') 405 405 {if(!this.roster[jid_lower]) 406 406 {this.addContact(barejid,'not-in-roster');}
Note: See TracChangeset
for help on using the changeset viewer.