Versión 1.04

- Separado el fichero de configuración del de versión
- Arreglado que el menú de la aplicación colapse en resoluciones pequeñas
- Añadidos los ficheros de fuentes que se habían cambiado
- Arreglado el nombre del fichero FPDF.php para que coincida con el nombre de la clase
- Añadido el puerto a la configuración de MySQL y añadido el puerto y el servidor como parámetros a la copia de seguridad

AportaContenido.php

@@ -237,7 +237,7 @@ class AportaContenido {
                             if (file_exists($archivo)) {
                                 unlink($archivo);
                             }
-                            $comando = escapeshellcmd(MYSQLDUMP . ' -u ' . USUARIO . ' --password=' . CLAVE . ' --result-file=' . $archivo_sql . ' ' . BASEDATOS);                                                       
+                            $comando = escapeshellcmd(MYSQLDUMP . ' -h ' . SERVIDOR . ' -P ' . PUERTO . ' -u ' . USUARIO . ' --password=' . CLAVE . ' --result-file=' . $archivo_sql . ' ' . BASEDATOS);                                                       
                             $comando2 = escapeshellcmd(GZIP . ' -9f ' . $archivo_sql);                                    
                             exec($comando);
                             exec($comando2);

Configuracion.php

@@ -25,7 +25,7 @@ class Configuracion {
     private $confAnterior = "inc/configuracion.ant";
     private $datosConf;
     //Campos del fichero de configuración que se van a editar.
-    private $lista = array('SERVIDOR', 'BASEDATOS', 'BASEDATOSTEST', 'USUARIO', 'CLAVE', 'CENTRO', 'NUMFILAS', 'ESTILO', 'PLANTILLA', 'COLORLAT', 'COLORFON', 'MYSQLDUMP', 'GZIP');
+    private $lista = array('SERVIDOR', 'PUERTO', 'BASEDATOS', 'BASEDATOSTEST', 'USUARIO', 'CLAVE', 'CENTRO', 'NUMFILAS', 'ESTILO', 'PLANTILLA', 'COLORLAT', 'COLORFON', 'MYSQLDUMP', 'GZIP');
     private $campos;
     
     public function __construct()
@@ -135,6 +135,7 @@ class Configuracion {
         $salida.='</select></td></tr>';
         $salida.='<th colspan=2 class="danger"><center><b>Base de datos</b></center></th>';
         $salida.='<tr><td>Servidor</td><td><input type="text" name="SERVIDOR" value="' . $this->datosConf['SERVIDOR'] . '" size="30" /></td></tr>';
+        $salida.='<tr><td>Puerto</td><td><input type="text" name="PUERTO" value="' . $this->datosConf['PUERTO'] . '" size="30" /></td></tr>';
         $salida.='<tr><td>Base de datos</td><td><input type="text" name="BASEDATOS" value="' . $this->datosConf['BASEDATOS'] . '" size="30" /></td></tr>';
         $salida.='<tr><td>Base de datos Tests</td><td><input type="text" name="BASEDATOSTEST" value="' . $this->datosConf['BASEDATOSTEST'] . '" size="30" /></td></tr>';
         $salida.='<tr><td>Usuario</td><td><input type="text" name="USUARIO" value="' . $this->datosConf['USUARIO'] . '" size="30" /></td></tr>';

Inventario.php

@@ -104,7 +104,7 @@ class Inventario {
                     $_SESSION['Usuario'] = $this->usuario;
                     $_SESSION['Perfil'] = $this->perfil;
                     // y enviamos la cookie para reconocerlo la próxima vez
-                    setcookie('InventarioId', $resultado, time() + 3600 * 24);
+                    setcookie('InventarioId', $resultado, time() + 3600 * 24 * 365);
                     // Lo enviamos a la página de bienvenida
                     header('Location: index.php?bienvenido');
                     exit;

css/bootstrap/fonts/glyphicons-halflings-regular.svg

@@ -226,5 +226,4 @@
 <glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
 <glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
 </font>
-    </defs>
+</defs></svg> 
-</svg> 

css/bootstrap/js/bootstrap.js

@@ -4,9 +4,7 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-if (typeof jQuery === 'undefined') {
+if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
-    throw new Error('Bootstrap\'s JavaScript requires jQuery')
-}
 
 /* ========================================================================
  * Bootstrap: transition.js v3.1.1
@@ -45,13 +43,8 @@ if (typeof jQuery === 'undefined') {
   // http://blog.alexmaccaw.com/css-transitions
   $.fn.emulateTransitionEnd = function (duration) {
     var called = false, $el = this
-        $(this).one($.support.transition.end, function() {
+    $(this).one($.support.transition.end, function () { called = true })
-            called = true
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-        })
-        var callback = function() {
-            if (!called)
-                $($el).trigger($.support.transition.end)
-        }
     setTimeout(callback, duration)
     return this
   }
@@ -93,8 +86,7 @@ if (typeof jQuery === 'undefined') {
 
     var $parent = $(selector)
 
-        if (e)
+    if (e) e.preventDefault()
-            e.preventDefault()
 
     if (!$parent.length) {
       $parent = $this.hasClass('alert') ? $this : $this.parent()
@@ -102,8 +94,7 @@ if (typeof jQuery === 'undefined') {
 
     $parent.trigger(e = $.Event('close.bs.alert'))
 
-        if (e.isDefaultPrevented())
+    if (e.isDefaultPrevented()) return
-            return
 
     $parent.removeClass('in')
 
@@ -129,10 +120,8 @@ if (typeof jQuery === 'undefined') {
       var $this = $(this)
       var data  = $this.data('bs.alert')
 
-            if (!data)
+      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-                $this.data('bs.alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
-            if (typeof option == 'string')
-                data[option].call($this)
     })
   }
 
@@ -188,8 +177,7 @@ if (typeof jQuery === 'undefined') {
 
     state = state + 'Text'
 
-        if (!data.resetText)
+    if (!data.resetText) $el.data('resetText', $el[val]())
-            $el.data('resetText', $el[val]())
 
     $el[val](data[state] || this.options[state])
 
@@ -212,17 +200,13 @@ if (typeof jQuery === 'undefined') {
     if ($parent.length) {
       var $input = this.$element.find('input')
       if ($input.prop('type') == 'radio') {
-                if ($input.prop('checked') && this.$element.hasClass('active'))
+        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
-                    changed = false
+        else $parent.find('.active').removeClass('active')
-                else
-                    $parent.find('.active').removeClass('active')
       }
-            if (changed)
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
-                $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
     }
 
-        if (changed)
+    if (changed) this.$element.toggleClass('active')
-            this.$element.toggleClass('active')
   }
 
 
@@ -237,13 +221,10 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.button')
       var options = typeof option == 'object' && option
 
-            if (!data)
+      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-                $this.data('bs.button', (data = new Button(this, options)))
 
-            if (option == 'toggle')
+      if (option == 'toggle') data.toggle()
-                data.toggle()
+      else if (option) data.setState(option)
-            else if (option)
-                data.setState(option)
     })
   }
 
@@ -264,8 +245,7 @@ if (typeof jQuery === 'undefined') {
 
   $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
     var $btn = $(e.target)
-        if (!$btn.hasClass('btn'))
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-            $btn = $btn.closest('.btn')
     $btn.button('toggle')
     e.preventDefault()
   })
@@ -331,15 +311,10 @@ if (typeof jQuery === 'undefined') {
     var that        = this
     var activeIndex = this.getActiveIndex()
 
-        if (pos > (this.$items.length - 1) || pos < 0)
+    if (pos > (this.$items.length - 1) || pos < 0) return
-            return
 
-        if (this.sliding)
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
-            return this.$element.one('slid.bs.carousel', function() {
+    if (activeIndex == pos) return this.pause().cycle()
-                that.to(pos)
-            })
-        if (activeIndex == pos)
-            return this.pause().cycle()
 
     return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
   }
@@ -358,14 +333,12 @@ if (typeof jQuery === 'undefined') {
   }
 
   Carousel.prototype.next = function () {
-        if (this.sliding)
+    if (this.sliding) return
-            return
     return this.slide('next')
   }
 
   Carousel.prototype.prev = function () {
-        if (this.sliding)
+    if (this.sliding) return
-            return
     return this.slide('prev')
   }
 
@@ -378,18 +351,15 @@ if (typeof jQuery === 'undefined') {
     var that      = this
 
     if (!$next.length) {
-            if (!this.options.wrap)
+      if (!this.options.wrap) return
-                return
       $next = this.$element.find('.item')[fallback]()
     }
 
-        if ($next.hasClass('active'))
+    if ($next.hasClass('active')) return this.sliding = false
-            return this.sliding = false
 
     var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
     this.$element.trigger(e)
-        if (e.isDefaultPrevented())
+    if (e.isDefaultPrevented()) return
-            return
 
     this.sliding = true
 
@@ -413,9 +383,7 @@ if (typeof jQuery === 'undefined') {
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
           that.sliding = false
-                setTimeout(function() {
+          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
-                    that.$element.trigger('slid.bs.carousel')
-                }, 0)
         })
         .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
     } else {
@@ -443,14 +411,10 @@ if (typeof jQuery === 'undefined') {
       var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
       var action  = typeof option == 'string' ? option : options.slide
 
-            if (!data)
+      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-                $this.data('bs.carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
-            if (typeof option == 'number')
+      else if (action) data[action]()
-                data.to(option)
+      else if (options.interval) data.pause().cycle()
-            else if (action)
-                data[action]()
-            else if (options.interval)
-                data.pause().cycle()
     })
   }
 
@@ -474,8 +438,7 @@ if (typeof jQuery === 'undefined') {
     var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
     var options = $.extend({}, $target.data(), $this.data())
     var slideIndex = $this.attr('data-slide-to')
-        if (slideIndex)
+    if (slideIndex) options.interval = false
-            options.interval = false
 
     $target.carousel(options)
 
@@ -515,10 +478,8 @@ if (typeof jQuery === 'undefined') {
     this.options       = $.extend({}, Collapse.DEFAULTS, options)
     this.transitioning = null
 
-        if (this.options.parent)
+    if (this.options.parent) this.$parent = $(this.options.parent)
-            this.$parent = $(this.options.parent)
+    if (this.options.toggle) this.toggle()
-        if (this.options.toggle)
-            this.toggle()
   }
 
   Collapse.DEFAULTS = {
@@ -531,20 +492,17 @@ if (typeof jQuery === 'undefined') {
   }
 
   Collapse.prototype.show = function () {
-        if (this.transitioning || this.$element.hasClass('in'))
+    if (this.transitioning || this.$element.hasClass('in')) return
-            return
 
     var startEvent = $.Event('show.bs.collapse')
     this.$element.trigger(startEvent)
-        if (startEvent.isDefaultPrevented())
+    if (startEvent.isDefaultPrevented()) return
-            return
 
     var actives = this.$parent && this.$parent.find('> .panel > .in')
 
     if (actives && actives.length) {
       var hasData = actives.data('bs.collapse')
-            if (hasData && hasData.transitioning)
+      if (hasData && hasData.transitioning) return
-                return
       actives.collapse('hide')
       hasData || actives.data('bs.collapse', null)
     }
@@ -567,8 +525,7 @@ if (typeof jQuery === 'undefined') {
       this.$element.trigger('shown.bs.collapse')
     }
 
-        if (!$.support.transition)
+    if (!$.support.transition) return complete.call(this)
-            return complete.call(this)
 
     var scrollSize = $.camelCase(['scroll', dimension].join('-'))
 
@@ -579,13 +536,11 @@ if (typeof jQuery === 'undefined') {
   }
 
   Collapse.prototype.hide = function () {
-        if (this.transitioning || !this.$element.hasClass('in'))
+    if (this.transitioning || !this.$element.hasClass('in')) return
-            return
 
     var startEvent = $.Event('hide.bs.collapse')
     this.$element.trigger(startEvent)
-        if (startEvent.isDefaultPrevented())
+    if (startEvent.isDefaultPrevented()) return
-            return
 
     var dimension = this.dimension()
 
@@ -608,8 +563,7 @@ if (typeof jQuery === 'undefined') {
         .addClass('collapse')
     }
 
-        if (!$.support.transition)
+    if (!$.support.transition) return complete.call(this)
-            return complete.call(this)
 
     this.$element
       [dimension](0)
@@ -633,12 +587,9 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.collapse')
       var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-            if (!data && options.toggle && option == 'show')
+      if (!data && options.toggle && option == 'show') option = !option
-                option = !option
+      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-            if (!data)
+      if (typeof option == 'string') data[option]()
-                $this.data('bs.collapse', (data = new Collapse(this, options)))
-            if (typeof option == 'string')
-                data[option]()
     })
   }
 
@@ -669,8 +620,7 @@ if (typeof jQuery === 'undefined') {
     var $parent = parent && $(parent)
 
     if (!data || !data.transitioning) {
-            if ($parent)
+      if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
-                $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
       $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
     }
 
@@ -703,8 +653,7 @@ if (typeof jQuery === 'undefined') {
   Dropdown.prototype.toggle = function (e) {
     var $this = $(this)
 
-        if ($this.is('.disabled, :disabled'))
+    if ($this.is('.disabled, :disabled')) return
-            return
 
     var $parent  = getParent($this)
     var isActive = $parent.hasClass('open')
@@ -720,8 +669,7 @@ if (typeof jQuery === 'undefined') {
       var relatedTarget = { relatedTarget: this }
       $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
 
-            if (e.isDefaultPrevented())
+      if (e.isDefaultPrevented()) return
-                return
 
       $parent
         .toggleClass('open')
@@ -734,40 +682,33 @@ if (typeof jQuery === 'undefined') {
   }
 
   Dropdown.prototype.keydown = function (e) {
-        if (!/(38|40|27)/.test(e.keyCode))
+    if (!/(38|40|27)/.test(e.keyCode)) return
-            return
 
     var $this = $(this)
 
     e.preventDefault()
     e.stopPropagation()
 
-        if ($this.is('.disabled, :disabled'))
+    if ($this.is('.disabled, :disabled')) return
-            return
 
     var $parent  = getParent($this)
     var isActive = $parent.hasClass('open')
 
     if (!isActive || (isActive && e.keyCode == 27)) {
-            if (e.which == 27)
+      if (e.which == 27) $parent.find(toggle).focus()
-                $parent.find(toggle).focus()
       return $this.click()
     }
 
     var desc = ' li:not(.divider):visible a'
     var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
 
-        if (!$items.length)
+    if (!$items.length) return
-            return
 
     var index = $items.index($items.filter(':focus'))
 
-        if (e.keyCode == 38 && index > 0)
+    if (e.keyCode == 38 && index > 0)                 index--                        // up
-            index--                        // up
+    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-        if (e.keyCode == 40 && index < $items.length - 1)
+    if (!~index)                                      index = 0
-            index++                        // down
-        if (!~index)
-            index = 0
 
     $items.eq(index).focus()
   }
@@ -777,11 +718,9 @@ if (typeof jQuery === 'undefined') {
     $(toggle).each(function () {
       var $parent = getParent($(this))
       var relatedTarget = { relatedTarget: this }
-            if (!$parent.hasClass('open'))
+      if (!$parent.hasClass('open')) return
-                return
       $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-            if (e.isDefaultPrevented())
+      if (e.isDefaultPrevented()) return
-                return
       $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
     })
   }
@@ -810,10 +749,8 @@ if (typeof jQuery === 'undefined') {
       var $this = $(this)
       var data  = $this.data('bs.dropdown')
 
-            if (!data)
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
-                $this.data('bs.dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
-            if (typeof option == 'string')
-                data[option].call($this)
     })
   }
 
@@ -834,9 +771,7 @@ if (typeof jQuery === 'undefined') {
 
   $(document)
     .on('click.bs.dropdown.data-api', clearMenus)
-            .on('click.bs.dropdown.data-api', '.dropdown form', function(e) {
+    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-        e.stopPropagation()
-    })
     .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
     .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
 
@@ -888,8 +823,7 @@ if (typeof jQuery === 'undefined') {
 
     this.$element.trigger(e)
 
-        if (this.isShown || e.isDefaultPrevented())
+    if (this.isShown || e.isDefaultPrevented()) return
-            return
 
     this.isShown = true
 
@@ -931,15 +865,13 @@ if (typeof jQuery === 'undefined') {
   }
 
   Modal.prototype.hide = function (e) {
-        if (e)
+    if (e) e.preventDefault()
-            e.preventDefault()
 
     e = $.Event('hide.bs.modal')
 
     this.$element.trigger(e)
 
-        if (!this.isShown || e.isDefaultPrevented())
+    if (!this.isShown || e.isDefaultPrevented()) return
-            return
 
     this.isShown = false
 
@@ -1003,20 +935,17 @@ if (typeof jQuery === 'undefined') {
         .appendTo(document.body)
 
       this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-                if (e.target !== e.currentTarget)
+        if (e.target !== e.currentTarget) return
-                    return
         this.options.backdrop == 'static'
           ? this.$element[0].focus.call(this.$element[0])
           : this.hide.call(this)
       }, this))
 
-            if (doAnimate)
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-                this.$backdrop[0].offsetWidth // force reflow
 
       this.$backdrop.addClass('in')
 
-            if (!callback)
+      if (!callback) return
-                return
 
       doAnimate ?
         this.$backdrop
@@ -1050,12 +979,9 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.modal')
       var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-            if (!data)
+      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-                $this.data('bs.modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option](_relatedTarget)
-            if (typeof option == 'string')
+      else if (options.show) data.show(_relatedTarget)
-                data[option](_relatedTarget)
-            else if (options.show)
-                data.show(_relatedTarget)
     })
   }
 
@@ -1080,8 +1006,7 @@ if (typeof jQuery === 'undefined') {
     var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
     var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
 
-        if ($this.is('a'))
+    if ($this.is('a')) e.preventDefault()
-            e.preventDefault()
 
     $target
       .modal(option, this)
@@ -1091,12 +1016,8 @@ if (typeof jQuery === 'undefined') {
   })
 
   $(document)
-            .on('show.bs.modal', '.modal', function() {
+    .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
-        $(document.body).addClass('modal-open')
+    .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
-    })
-            .on('hidden.bs.modal', '.modal', function() {
-        $(document.body).removeClass('modal-open')
-    })
 
 }(jQuery);
 
@@ -1188,8 +1109,7 @@ if (typeof jQuery === 'undefined') {
     var defaults = this.getDefaults()
 
     this._options && $.each(this._options, function (key, value) {
-            if (defaults[key] != value)
+      if (defaults[key] != value) options[key] = value
-                options[key] = value
     })
 
     return options
@@ -1203,12 +1123,10 @@ if (typeof jQuery === 'undefined') {
 
     self.hoverState = 'in'
 
-        if (!self.options.delay || !self.options.delay.show)
+    if (!self.options.delay || !self.options.delay.show) return self.show()
-            return self.show()
 
     self.timeout = setTimeout(function () {
-            if (self.hoverState == 'in')
+      if (self.hoverState == 'in') self.show()
-                self.show()
     }, self.options.delay.show)
   }
 
@@ -1220,12 +1138,10 @@ if (typeof jQuery === 'undefined') {
 
     self.hoverState = 'out'
 
-        if (!self.options.delay || !self.options.delay.hide)
+    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-            return self.hide()
 
     self.timeout = setTimeout(function () {
-            if (self.hoverState == 'out')
+      if (self.hoverState == 'out') self.hide()
-                self.hide()
     }, self.options.delay.hide)
   }
 
@@ -1235,16 +1151,14 @@ if (typeof jQuery === 'undefined') {
     if (this.hasContent() && this.enabled) {
       this.$element.trigger(e)
 
-            if (e.isDefaultPrevented())
+      if (e.isDefaultPrevented()) return
-                return
       var that = this;
 
       var $tip = this.tip()
 
       this.setContent()
 
-            if (this.options.animation)
+      if (this.options.animation) $tip.addClass('fade')
-                $tip.addClass('fade')
 
       var placement = typeof this.options.placement == 'function' ?
         this.options.placement.call(this, $tip[0], this.$element[0]) :
@@ -1252,8 +1166,7 @@ if (typeof jQuery === 'undefined') {
 
       var autoToken = /\s?auto?\s?/i
       var autoPlace = autoToken.test(placement)
-            if (autoPlace)
+      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-                placement = placement.replace(autoToken, '') || 'top'
 
       $tip
         .detach()
@@ -1314,10 +1227,8 @@ if (typeof jQuery === 'undefined') {
     var marginLeft = parseInt($tip.css('margin-left'), 10)
 
     // we must check for NaN for ie 8/9
-        if (isNaN(marginTop))
+    if (isNaN(marginTop))  marginTop  = 0
-            marginTop = 0
+    if (isNaN(marginLeft)) marginLeft = 0
-        if (isNaN(marginLeft))
-            marginLeft = 0
 
     offset.top  = offset.top  + marginTop
     offset.left = offset.left + marginLeft
@@ -1362,8 +1273,7 @@ if (typeof jQuery === 'undefined') {
       this.replaceArrow(actualHeight - height, actualHeight, 'top')
     }
 
-        if (replace)
+    if (replace) $tip.offset(offset)
-            $tip.offset(offset)
   }
 
   Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
@@ -1384,15 +1294,13 @@ if (typeof jQuery === 'undefined') {
     var e    = $.Event('hide.bs.' + this.type)
 
     function complete() {
-            if (that.hoverState != 'in')
+      if (that.hoverState != 'in') $tip.detach()
-                $tip.detach()
       that.$element.trigger('hidden.bs.' + that.type)
     }
 
     this.$element.trigger(e)
 
-        if (e.isDefaultPrevented())
+    if (e.isDefaultPrevented()) return
-            return
 
     $tip.removeClass('in')
 
@@ -1494,12 +1402,9 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.tooltip')
       var options = typeof option == 'object' && option
 
-            if (!data && option == 'destroy')
+      if (!data && option == 'destroy') return
-                return
+      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-            if (!data)
+      if (typeof option == 'string') data[option]()
-                $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-            if (typeof option == 'string')
-                data[option]()
     })
   }
 
@@ -1535,8 +1440,7 @@ if (typeof jQuery === 'undefined') {
     this.init('popover', element, options)
   }
 
-    if (!$.fn.tooltip)
+  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-        throw new Error('Popover requires tooltip.js')
 
   Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
     placement: 'right',
@@ -1571,8 +1475,7 @@ if (typeof jQuery === 'undefined') {
 
     // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
     // this manually by checking the contents.
-        if (!$tip.find('.popover-title').html())
+    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-            $tip.find('.popover-title').hide()
   }
 
   Popover.prototype.hasContent = function () {
@@ -1594,8 +1497,7 @@ if (typeof jQuery === 'undefined') {
   }
 
   Popover.prototype.tip = function () {
-        if (!this.$tip)
+    if (!this.$tip) this.$tip = $(this.options.template)
-            this.$tip = $(this.options.template)
     return this.$tip
   }
 
@@ -1611,12 +1513,9 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.popover')
       var options = typeof option == 'object' && option
 
-            if (!data && option == 'destroy')
+      if (!data && option == 'destroy') return
-                return
+      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-            if (!data)
+      if (typeof option == 'string') data[option]()
-                $this.data('bs.popover', (data = new Popover(this, options)))
-            if (typeof option == 'string')
-                data[option]()
     })
   }
 
@@ -1690,9 +1589,7 @@ if (typeof jQuery === 'undefined') {
           && $href.is(':visible')
           && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
       })
-                .sort(function(a, b) {
+      .sort(function (a, b) { return a[0] - b[0] })
-            return a[0] - b[0]
-        })
       .each(function () {
         self.offsets.push(this[0])
         self.targets.push(this[1])
@@ -1760,10 +1657,8 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.scrollspy')
       var options = typeof option == 'object' && option
 
-            if (!data)
+      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-                $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
-            if (typeof option == 'string')
-                data[option]()
     })
   }
 
@@ -1820,8 +1715,7 @@ if (typeof jQuery === 'undefined') {
       selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
     }
 
-        if ($this.parent('li').hasClass('active'))
+    if ($this.parent('li').hasClass('active')) return
-            return
 
     var previous = $ul.find('.active:last a')[0]
     var e        = $.Event('show.bs.tab', {
@@ -1830,8 +1724,7 @@ if (typeof jQuery === 'undefined') {
 
     $this.trigger(e)
 
-        if (e.isDefaultPrevented())
+    if (e.isDefaultPrevented()) return
-            return
 
     var $target = $(selector)
 
@@ -1892,10 +1785,8 @@ if (typeof jQuery === 'undefined') {
       var $this = $(this)
       var data  = $this.data('bs.tab')
 
-            if (!data)
+      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-                $this.data('bs.tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
-            if (typeof option == 'string')
-                data[option]()
     })
   }
 
@@ -1957,8 +1848,7 @@ if (typeof jQuery === 'undefined') {
   }
 
   Affix.prototype.getPinnedOffset = function () {
-        if (this.pinnedOffset)
+    if (this.pinnedOffset) return this.pinnedOffset
-            return this.pinnedOffset
     this.$element.removeClass(Affix.RESET).addClass('affix')
     var scrollTop = this.$window.scrollTop()
     var position  = this.$element.offset()
@@ -1970,8 +1860,7 @@ if (typeof jQuery === 'undefined') {
   }
 
   Affix.prototype.checkPosition = function () {
-        if (!this.$element.is(':visible'))
+    if (!this.$element.is(':visible')) return
-            return
 
     var scrollHeight = $(document).height()
     var scrollTop    = this.$window.scrollTop()
@@ -1980,32 +1869,25 @@ if (typeof jQuery === 'undefined') {
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
 
-        if (this.affixed == 'top')
+    if (this.affixed == 'top') position.top += scrollTop
-            position.top += scrollTop
 
-        if (typeof offset != 'object')
+    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-            offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-        if (typeof offsetTop == 'function')
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
-            offsetTop = offset.top(this.$element)
-        if (typeof offsetBottom == 'function')
-            offsetBottom = offset.bottom(this.$element)
 
     var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
                 offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
                 offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
 
-        if (this.affixed === affix)
+    if (this.affixed === affix) return
-            return
+    if (this.unpin) this.$element.css('top', '')
-        if (this.unpin)
-            this.$element.css('top', '')
 
     var affixType = 'affix' + (affix ? '-' + affix : '')
     var e         = $.Event(affixType + '.bs.affix')
 
     this.$element.trigger(e)
 
-        if (e.isDefaultPrevented())
+    if (e.isDefaultPrevented()) return
-            return
 
     this.affixed = affix
     this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
@@ -2032,10 +1914,8 @@ if (typeof jQuery === 'undefined') {
       var data    = $this.data('bs.affix')
       var options = typeof option == 'object' && option
 
-            if (!data)
+      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-                $this.data('bs.affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
-            if (typeof option == 'string')
-                data[option]()
     })
   }
 
@@ -2061,10 +1941,8 @@ if (typeof jQuery === 'undefined') {
 
       data.offset = data.offset || {}
 
-            if (data.offsetBottom)
+      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-                data.offset.bottom = data.offsetBottom
+      if (data.offsetTop)    data.offset.top    = data.offsetTop
-            if (data.offsetTop)
-                data.offset.top = data.offsetTop
 
       $spy.affix(data)
     })

css/jquery.simplecolorpicker.js

@@ -22,6 +22,7 @@
    */
   SimpleColorPicker.prototype = {
     constructor: SimpleColorPicker,
+
     init: function(type, select, options) {
       var self = this;
 
@@ -102,6 +103,7 @@
         }
       });
     },
+
     /**
      * Changes the selected color.
      *
@@ -120,6 +122,7 @@
         console.error("The given color '" + color + "' could not be found");
       }
     },
+
     showPicker: function() {
       var pos = this.$icon.offset();
       this.$picker.css({
@@ -130,9 +133,11 @@
 
       this.$picker.show(this.options.pickerDelay);
     },
+
     hidePicker: function() {
       this.$picker.hide(this.options.pickerDelay);
     },
+
     /**
      * Selects the given span inside $colorList.
      *
@@ -156,6 +161,7 @@
       // Change HTML select value
       this.$select.val(color);
     },
+
     /**
      * The user clicked on a color inside $colorList.
      */
@@ -166,6 +172,7 @@
         this.$select.trigger('change');
       }
     },
+
     /**
      * Prevents the mousedown event from "eating" the click event.
      */
@@ -173,6 +180,7 @@
       e.stopPropagation();
       e.preventDefault();
     },
+
     destroy: function() {
       if (this.options.picker === true) {
         this.$icon.off('.' + this.type);
@@ -216,8 +224,10 @@
   $.fn.simplecolorpicker.defaults = {
     // No theme by default
     theme: '',
+
     // Show the picker or make it inline
     picker: false,
+
     // Animation delay in milliseconds
     pickerDelay: 0
   };

font/courier.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Courier';
 $up = -100;

font/courierb.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Courier-Bold';
 $up = -100;

font/courierbi.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Courier-BoldOblique';
 $up = -100;

font/courieri.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Courier-Oblique';
 $up = -100;

font/helvetica.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Helvetica';
 $up = -100;

font/helveticab.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Helvetica-Bold';
 $up = -100;

font/helveticabi.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Helvetica-BoldOblique';
 $up = -100;

font/helveticai.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Helvetica-Oblique';
 $up = -100;

font/makefont/makefont.php

@@ -1,5 +1,4 @@
 <?php
-
 /*******************************************************************************
 * Utility to generate font definition files                                    *
 *                                                                              *
@@ -16,15 +15,18 @@ function ReadMap($enc)
 	if(empty($a))
 		die('<b>Error:</b> encoding not found: '.$enc);
 	$cc2gn=array();
-    foreach ($a as $l) {
+	foreach($a as $l)
-        if ($l[0] == '!') {
+	{
+		if($l[0]=='!')
+		{
 			$e=preg_split('/[ \\t]+/',rtrim($l));
 			$cc=hexdec(substr($e[0],1));
 			$gn=$e[2];
 			$cc2gn[$cc]=$gn;
 		}
 	}
-    for ($i = 0; $i <= 255; $i++) {
+	for($i=0;$i<=255;$i++)
+	{
 		if(!isset($cc2gn[$i]))
 			$cc2gn[$i]='.notdef';
 	}
@@ -47,30 +49,37 @@ function ReadAFM($file, &$map)
 		'Tcedilla'=>'Tcommaaccent','tcedilla'=>'tcommaaccent','Dslash'=>'Dcroat','dslash'=>'dcroat','Dmacron'=>'Dcroat','dmacron'=>'dcroat',
 		'combininggraveaccent'=>'gravecomb','combininghookabove'=>'hookabovecomb','combiningtildeaccent'=>'tildecomb',
 		'combiningacuteaccent'=>'acutecomb','combiningdotbelow'=>'dotbelowcomb','dongsign'=>'dong');
-    foreach ($a as $l) {
+	foreach($a as $l)
+	{
 		$e=explode(' ',rtrim($l));
 		if(count($e)<2)
 			continue;
 		$code=$e[0];
 		$param=$e[1];
-        if ($code == 'C') {
+		if($code=='C')
+		{
 			//Character metrics
 			$cc=(int)$e[1];
 			$w=$e[4];
 			$gn=$e[7];
 			if(substr($gn,-4)=='20AC')
 				$gn='Euro';
-            if (isset($fix[$gn])) {
+			if(isset($fix[$gn]))
+			{
 				//Fix incorrect glyph name
-                foreach ($map as $c => $n) {
+				foreach($map as $c=>$n)
+				{
 					if($n==$fix[$gn])
 						$map[$c]=$gn;
 				}
 			}
-            if (empty($map)) {
+			if(empty($map))
+			{
 				//Symbolic font: use built-in encoding
 				$widths[$cc]=$w;
-            } else {
+			}
+			else
+			{
 				$widths[$gn]=$w;
 				if($gn=='X')
 					$fm['CapXHeight']=$e[13];
@@ -103,14 +112,17 @@ function ReadAFM($file, &$map)
 	}
 	if(!isset($fm['FontName']))
 		die('FontName not found');
-    if (!empty($map)) {
+	if(!empty($map))
+	{
 		if(!isset($widths['.notdef']))
 			$widths['.notdef']=600;
 		if(!isset($widths['Delta']) && isset($widths['increment']))
 			$widths['Delta']=$widths['increment'];
 		//Order widths according to map
-        for ($i = 0; $i <= 255; $i++) {
+		for($i=0;$i<=255;$i++)
-            if (!isset($widths[$map[$i]])) {
+		{
+			if(!isset($widths[$map[$i]]))
+			{
 				echo '<b>Warning:</b> character '.$map[$i].' is missing<br>';
 				$widths[$i]=$widths['.notdef'];
 			}
@@ -178,7 +190,8 @@ function MakeWidthArray($fm)
 	//Make character width array
 	$s="array(\n\t";
 	$cw=$fm['Widths'];
-    for ($i = 0; $i <= 255; $i++) {
+	for($i=0;$i<=255;$i++)
+	{
 		if(chr($i)=="'")
 			$s.="'\\''";
 		elseif(chr($i)=="\\")
@@ -203,8 +216,10 @@ function MakeFontEncoding($map)
 	$ref=ReadMap('cp1252');
 	$s='';
 	$last=0;
-    for ($i = 32; $i <= 255; $i++) {
+	for($i=32;$i<=255;$i++)
-        if ($map[$i] != $ref[$i]) {
+	{
+		if($map[$i]!=$ref[$i])
+		{
 			if($i!=$last+1)
 				$s.=$i.' ';
 			$last=$i;
@@ -247,14 +262,17 @@ function CheckTTF($file)
 	fseek($f,6,SEEK_CUR);
 	//Seek OS/2 table
 	$found=false;
-    for ($i = 0; $i < $nb; $i++) {
+	for($i=0;$i<$nb;$i++)
-        if (fread($f, 4) == 'OS/2') {
+	{
+		if(fread($f,4)=='OS/2')
+		{
 			$found=true;
 			break;
 		}
 		fseek($f,12,SEEK_CUR);
 	}
-    if (!$found) {
+	if(!$found)
+	{
 		fclose($f);
 		return;
 	}
@@ -279,14 +297,14 @@ function CheckTTF($file)
 * patch:    optional patch for encoding                                        *
 * type:     font type if fontfile is empty                                     *
 *******************************************************************************/
-
 function MakeFont($fontfile, $afmfile, $enc='cp1252', $patch=array(), $type='TrueType')
 {
 	//Generate a font definition file
 	if(get_magic_quotes_runtime())
 		@set_magic_quotes_runtime(0);
 	ini_set('auto_detect_line_endings','1');
-    if ($enc) {
+	if($enc)
+	{
 		$map=ReadMap($enc);
 		foreach($patch as $cc=>$gn)
 			$map[$cc]=$gn;
@@ -302,7 +320,8 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type
 		$diff='';
 	$fd=MakeFontDescriptor($fm,empty($map));
 	//Find font type
-    if ($fontfile) {
+	if($fontfile)
+	{
 		$ext=strtolower(substr($fontfile,-3));
 		if($ext=='ttf')
 			$type='TrueType';
@@ -311,7 +330,8 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type
 		else
 			die('<b>Error:</b> unrecognized font file extension: '.$ext);
 	}
-    else {
+	else
+	{
 		if($type!='TrueType' && $type!='Type1')
 			die('<b>Error:</b> incorrect font type: '.$type);
 	}
@@ -331,7 +351,8 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type
 	$s.='$enc=\''.$enc."';\n";
 	$s.='$diff=\''.$diff."';\n";
 	$basename=substr(basename($afmfile),0,-4);
-    if ($fontfile) {
+	if($fontfile)
+	{
 		//Embedded font
 		if(!file_exists($fontfile))
 			die('<b>Error:</b> font file not found: '.$fontfile);
@@ -342,10 +363,12 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type
 			die('<b>Error:</b> Can\'t open '.$fontfile);
 		$file=fread($f,filesize($fontfile));
 		fclose($f);
-        if ($type == 'Type1') {
+		if($type=='Type1')
+		{
 			//Find first two sections and discard third one
 			$header=(ord($file[0])==128);
-            if ($header) {
+			if($header)
+			{
 				//Strip first binary header
 				$file=substr($file,6);
 			}
@@ -353,7 +376,8 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type
 			if(!$pos)
 				die('<b>Error:</b> font file does not seem to be valid Type1');
 			$size1=$pos+6;
-            if ($header && ord($file[$size1]) == 128) {
+			if($header && ord($file[$size1])==128)
+			{
 				//Strip second binary header
 				$file=substr($file,0,$size1).substr($file,$size1+6);
 			}
@@ -363,23 +387,28 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type
 			$size2=$pos-$size1;
 			$file=substr($file,0,$size1+$size2);
 		}
-        if (function_exists('gzcompress')) {
+		if(function_exists('gzcompress'))
+		{
 			$cmp=$basename.'.z';
 			SaveToFile($cmp,gzcompress($file),'b');
 			$s.='$file=\''.$cmp."';\n";
 			echo 'Font file compressed ('.$cmp.')<br>';
-        } else {
+		}
+		else
+		{
 			$s.='$file=\''.basename($fontfile)."';\n";
 			echo '<b>Notice:</b> font file could not be compressed (zlib extension not available)<br>';
 		}
-        if ($type == 'Type1') {
+		if($type=='Type1')
+		{
 			$s.='$size1='.$size1.";\n";
 			$s.='$size2='.$size2.";\n";
 		}
 		else
 			$s.='$originalsize='.filesize($fontfile).";\n";
 	}
-    else {
+	else
+	{
 		//Not embedded font
 		$s.='$file='."'';\n";
 	}
@@ -387,5 +416,4 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type
 	SaveToFile($basename.'.php',$s,'t');
 	echo 'Font definition file generated ('.$basename.'.php'.')<br>';
 }
-
 ?>

font/symbol.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Symbol';
 $up = -100;

font/times.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Times-Roman';
 $up = -100;

font/timesb.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Times-Bold';
 $up = -100;

font/timesbi.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Times-BoldItalic';
 $up = -100;

font/timesi.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'Times-Italic';
 $up = -100;

font/zapfdingbats.php

@@ -1,5 +1,4 @@
 <?php
-
 $type = 'Core';
 $name = 'ZapfDingbats';
 $up = -100;

inc/configuracion.inc

@@ -24,6 +24,7 @@
 require_once 'version.inc';
 
 define('SERVIDOR', 'localhost'); //Ubicación del servidor MySQL
+define('PUERTO', '3306'); //Puerto donde se conecta a MySQL
 define('BASEDATOS', 'Inventario2'); //Nombre de la base de datos.
 define('BASEDATOSTEST', 'Inventario_test'); //Base de datos para los tests.
 define('USUARIO', 'test'); //Usuario con permisos de lectura/escritura en la base de datos

inc/version.inc

@@ -23,5 +23,5 @@
  */
 
 define('AUTOR', 'Ricardo Montañana Gómez');
-define('VERSION', '1.03b');
+define('VERSION', '1.04');
 ?>

sql/upgrade.php

@@ -22,8 +22,8 @@
 $host="localhost";
 $baseAnt="Inventario";
 $baseNueva="Inventario2";
-$usuario="root";
+$usuario="test";
-$claveUsuario="galeote";
+$claveUsuario="tset";
 $probar=false;
 
 

tests/ConfiguracionTest.php

@@ -1,75 +0,0 @@
-<?php
-
-require_once 'Configuracion.php';
-
-/**
- * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-07 at 23:58:14.
- */
-class ConfiguracionTest extends PHPUnit_Framework_TestCase {
-
-    /**
-     * @var Configuracion
-     */
-    protected $config;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->config = new Configuracion;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Configuracion::ejecuta
-     */
-    public function testEjecuta()
-    {
-        $this->assertFileExists('inc/Configuracion.inc', "El fichero de configuración no existe");
-        $permisos = fileperms('inc/Configuracion.inc');
-        //Comprueba que el propietario o el grupo tengan derecho de escritura
-        $test = $permisos & 0x0080 || $permisos & 0x0010;
-        $this->assertTrue($test, "El fichero de configuración no tiene los permisos adecuados");
-        //Comprueba que existan todas las claves editables en el fichero de configuración.
-        $fichero = $this->config->obtieneFichero();
-        $this->assertNotNull($fichero, "El fichero de configuración no se ha leído o no tiene contenido");
-        $lineas = explode("\n", $fichero);
-        $campos = $this->config->obtieneLista();
-        $numero = 0;
-        $lista = implode(",", $campos);
-        //var_dump($campos);
-        //var_dump($lista);
-        foreach ($lineas as $linea) {
-            if (stripos($linea, "DEFINE") !== false) {
-                $this->assertStringMatchesFormat("define('%s', '%s');%S", $linea, "La línea [" . $linea . "] del fichero de configuración no tiene el formato correcto");
-                $this->config->obtieneDatos($linea, $clave, $valor);
-                if (stripos($lista, $clave) !== false) {
-                    $this->assertContains($clave, $campos, "El fichero de configuración no tiene la clave [" . $clave . "]");
-                    $numero++;
-                    $verificados[] = $clave;
-                }
-            }
-        }
-        $this->assertCount($numero, $campos, "No se han verificado todas las claves");
-        if ($numero != count($campos)) {
-            echo "Las claves verificadas han sido: \n";
-            var_export($verificados);
-        }
-        // @todo comprobar que la salida incluye una tabla con todos los campos editables.
-        // @todo comprobar que los valores seleccionados se corresponden co los del fichero
-        $salida = $this->config->ejecuta();
-    }
-
-}
-
-?>

tests/MenuTest.php

@@ -1,47 +0,0 @@
-<?php
-
-require_once('Menu.php');
-
-/**
- * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-08 at 17:47:42.
- */
-class MenuTest extends PHPUnit_Framework_TestCase {
-
-    /**
-     * @var Menu
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Menu('inc/inventario.menu');
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Menu::insertaMenu
-     * @todo   Implement testInsertaMenu().
-     */
-    public function testInsertaMenu()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
-
-?>

tests/SqlTest.php

@@ -1,204 +0,0 @@
-<?php
-
-require_once('inc/configuracion.inc');
-require_once('Sql.php');
-
-/**
- * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-08 at 01:19:34.
- */
-class SqlTest extends PHPUnit_Framework_TestCase {
-
-    /**
-     * @var Sql
-     */
-    protected $bd;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     * @covers Sql::__construct
-     * @uses Sql
-     */
-    protected function setUp()
-    {
-        $this->bd = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOSTEST);
-        $this->assertFalse($this->bd->error(), "No se ha conectado a la base de datos de pruebas [" . BASEDATOSTEST . "]");
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Sql::__destruct
-     * @todo   Implement test__destruct().
-     */
-    public function test__destruct()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::filtra
-     * @todo   Implement testFiltra().
-     */
-    public function testFiltra()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::ejecuta
-     * @todo   Implement testEjecuta().
-     */
-    public function testEjecuta()
-    {
-        
-    }
-
-    /**
-     * @covers Sql::procesaResultado
-     * @todo   Implement testProcesaResultado().
-     */
-    public function testProcesaResultado()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::camposResultado
-     * @todo   Implement testCamposResultado().
-     */
-    public function testCamposResultado()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::numeroTuplas
-     * @todo   Implement testNumeroTuplas().
-     */
-    public function testNumeroTuplas()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::error
-     * @todo   Implement testError().
-     */
-    public function testError()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::mensajeError
-     * @todo   Implement testMensajeError().
-     */
-    public function testMensajeError()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::estructura
-     * @todo   Implement testEstructura().
-     */
-    public function testEstructura()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::ultimoId
-     * @todo   Implement testUltimoId().
-     */
-    public function testUltimoId()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::obtieneManejador
-     * @todo   Implement testObtieneManejador().
-     */
-    public function testObtieneManejador()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::comienzaTransaccion
-     * @todo   Implement testComienzaTransaccion().
-     */
-    public function testComienzaTransaccion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::abortaTransaccion
-     * @todo   Implement testAbortaTransaccion().
-     */
-    public function testAbortaTransaccion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Sql::confirmaTransaccion
-     * @todo   Implement testConfirmaTransaccion().
-     */
-    public function testConfirmaTransaccion()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
-
-?>