← Back to branch summary

~ubuntu-branches/ubuntu/utopic/zonecheck/utopic-proposed

« back to all changes in this revision

Viewing changes to zc/input/cgi.rb

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Delafond
  • Date: 2010-07-08 12:55:39 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100708125539-gazuzu1eb58l3tot
Tags: 3.0.2-1
http://bugs.debian.org/587419
* New upstream release (Closes: #587419).
* Updated watch file.
* Bumped up Standards revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
zc/input/cgi.rb
1
 
# $Id: cgi.rb,v 1.61 2010/06/07 08:51:25 chabannf Exp $
 
1
# $Id: cgi.rb,v 1.64 2010/06/29 13:13:09 chabannf Exp $
2
2
 
3
3
# 
4
4
# CONTACT     : zonecheck@nic.fr
5
5
# AUTHOR      : Stephane D'Alu <sdalu@nic.fr>
6
6
#
7
7
# CREATED     : 2002/08/02 13:58:17
8
 
# REVISION    : $Revision: 1.61 $ 
9
 
# DATE        : $Date: 2010/06/07 08:51:25 $
 
8
# REVISION    : $Revision: 1.64 $ 
 
9
# DATE        : $Date: 2010/06/29 13:13:09 $
10
10
#
11
11
# CONTRIBUTORS: (see also CREDITS file)
12
12
#
233
233
            
234
234
      # DNSSEC
235
235
            sd = [""]
236
 
      if @cgi.has_key?('ds')
 
236
      if @cgi.has_key?('ds') && !@cgi.params['ds'].join("").empty?
237
237
        if @cgi.has_key?('ha')
238
 
          @cgi.params['ds'] = @cgi.params['ds'].upcase
 
238
          @cgi.params['ds'] = @cgi.params['ds'].join("").upcase
239
239
          unless @cgi.params['ds'].gsub(/[^A-F0-9]/,"").nil?
240
 
            @cgi.params['ds'] = @cgi.params['dnskey'].gsub(/[^A-F0-9]/,"")
 
240
            @cgi.params['ds'] = @cgi.params['ds'].gsub(/[^A-F0-9]/,"")
241
241
          end
242
 
          
243
 
          sd << "DS:" + @cgi.params['ds'] + ":" + @cgi.params['ha']
244
 
        else
 
242
          sd << "DS:" + @cgi.params['ds'] + ":" + @cgi.params['ha'].join("")
245
243
        end
246
244
      end
247
 
      if @cgi.has_key?('dnskey')
 
245
      if @cgi.has_key?('dnskey') && !@cgi.params['dnskey'].join("").empty?
248
246
        @cgi.params['dnskey'] = @cgi.params['dnskey'].join("")
249
247
        unless @cgi.params['dnskey'].gsub(/[^A-Za-z0-9\/+=]/,"").nil?
250
248
          @cgi.params['dnskey'] = @cgi.params['dnskey'].gsub(/[^A-Za-z0-9\/+=]/,"")
275
273
                    next unless ns = cgi_ns[0]
276
274
                    next unless !ns.empty?
277
275
                   
278
 
                    cgi_ips = @cgi.params["ips#{i}"] || ''
279
 
                    if cgi_ips.nil? || cgi_ips.length == 0 
 
276
                    
 
277
        cgi_ips = []
 
278
              @cgi.params["ips#{i}"].each {|e| 
 
279
          cgi_ips << e if e != nil && !e.empty?
 
280
              }
 
281
              
 
282
        cgi_ips = (cgi_ips.empty? ? nil : cgi_ips) || ''
 
283
                    
 
284
                    if cgi_ips.nil? || cgi_ips.length == 0 || cgi_ips == '' || cgi_ips.empty?
280
285
                        ns_list << [ ns ]
281
286
                    else
282
287
                        ips = cgi_ips.collect { |a| 
285
290
                    end
286
291
                }
287
292
 
288
 
#               i       = 0
289
 
#               while ((cgi_ns = @cgi.params["ns#{i}"])                 &&
290
 
#                      !cgi_ns.empty?                                   &&
291
 
#                      (ns = cgi_ns[0])                                 &&
292
 
#                      !ns.empty?) do
293
 
#                   cgi_ips = @cgi.params["ips#{i}"] || []
294
 
#                   if cgi_ips.nil? || cgi_ips.length == 0 
295
 
#                       ns_list << [ ns ]
296
 
#                   else
297
 
#                       ips = cgi_ips.collect { |a| 
298
 
#                           a.split(/\s*,\s*|\s+/) }.flatten.compact
299
 
#                       ns_list << [ ns, ips ]
300
 
#                   end
301
 
#                   i += 1
302
 
#               end
303
 
 
304
293
                if ! ns_list.empty?
305
294
                    p.domain.ns   = ns_list.collect { |ns, ips|
306
295
                        ips ? "#{ns}=#{ips.join(',')}" : ns }.join(';')