fixed replacements
This commit is contained in:
		
							parent
							
								
									383867e76a
								
							
						
					
					
						commit
						bd6f785921
					
				
					 1 changed files with 15 additions and 15 deletions
				
			
		
							
								
								
									
										30
									
								
								confGen
									
										
									
									
									
								
							
							
						
						
									
										30
									
								
								confGen
									
										
									
									
									
								
							|  | @ -45,36 +45,36 @@ with open('templates/'+args['device']+'.xml', 'r') as file: | ||||||
|     data = file.read().replace('\n', '') |     data = file.read().replace('\n', '') | ||||||
| 
 | 
 | ||||||
| if args['provName'] is None: | if args['provName'] is None: | ||||||
|     data.replace("{NAME}",'Nokia SIP') |     data = data.replace("{NAME}",'Nokia SIP') | ||||||
| else: | else: | ||||||
|     data.replace("{NAME}",args['provName']) |     data = data.replace("{NAME}",args['provName']) | ||||||
| 
 |      | ||||||
| if args['port'] is None: | if args['port'] is None: | ||||||
|     data.replace("{PORT}",str(5060)) |     data = data.replace("{PORT}",str(5060)) | ||||||
|     proxyport = 5060 |     proxyport = 5060 | ||||||
| else: | else: | ||||||
|     data.replace("{PORT}",args['port']) |     data = data.replace("{PORT}",args['port']) | ||||||
|     proxyport = args['port'] |     proxyport = args['port'] | ||||||
| 
 | 
 | ||||||
| if args['proxy'] is None: | if args['proxy'] is None: | ||||||
|     data.replace("{REGISTRAR}",args['server']) |     data = data.replace("{REGISTRAR}",args['server']) | ||||||
| else: | else: | ||||||
|     data.replace("{REGISTRAR}",args['proxy']) |     data = data.replace("{REGISTRAR}",args['proxy']) | ||||||
| 
 | 
 | ||||||
| if args['proxyPort'] is None: | if args['proxyPort'] is None: | ||||||
|     data.replace("{REGISTRAR_PORT}",str(proxyport)) |     data = data.replace("{REGISTRAR_PORT}",str(proxyport)) | ||||||
| else: | else: | ||||||
|     data.replace("{REGISTRAR_PORT}",args['proxyPort']) |     data = data.replace("{REGISTRAR_PORT}",args['proxyPort']) | ||||||
| 
 | 
 | ||||||
| # This will give an option for "Service Homepage" on the phone | # This will give an option for "Service Homepage" on the phone | ||||||
| if args['provURI'] is None: | if args['provURI'] is None: | ||||||
|     data.replace("{PROV_URI}", 'http://projects.fnukhosting.net/nokiasip/prov.php?devicetype='+args['device']) |     data = data.replace("{PROV_URI}", 'http://projects.fnukhosting.net/nokiasip/prov.php?devicetype='+args['device']) | ||||||
| else: | else: | ||||||
|     data.replace("{PROV_URI}",args['provURI']) |     data = data.replace("{PROV_URI}",args['provURI']) | ||||||
| 
 | 
 | ||||||
| data.replace("{DOMAIN}",args['server']) | data = data.replace("{DOMAIN}",args['server']) | ||||||
| data.replace("{USER}",args['username']) | data = data.replace("{USER}",args['username']) | ||||||
| data.replace("{PASSWORD}",args['password']) | data = data.replace("{PASSWORD}",args['password']) | ||||||
| 
 | 
 | ||||||
| # prov = wbxml.xml_to_wbxml(data) | # prov = wbxml.xml_to_wbxml(data) | ||||||
| 
 | 
 | ||||||
|  | @ -86,4 +86,4 @@ else: | ||||||
|     outputFile = 'config.prov' |     outputFile = 'config.prov' | ||||||
| 
 | 
 | ||||||
| prov = subprocess.Popen(["./libwbxml/bin/xml2wbxml", "-o"+outputFile, "-"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) | prov = subprocess.Popen(["./libwbxml/bin/xml2wbxml", "-o"+outputFile, "-"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) | ||||||
| prov = prov.communicate(input=bytes(data))[0] | prov = prov.communicate(input=bytes(data))[0] | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue