buscar_candidato.php

@@ -1,38 +0,0 @@
-<?php
-include("seguridad.php");
-include("functions.php");
-
-// Sólo los administradores y rrhh pueden buscar
-if(!$usuario->tieneRol("1")
-	&& !$usuario->tieneRol("4")){
-        header("Location: aplicacion.php?e=permiso");
-        exit;
-}
-
-include_once("html/cabecera.php");
-
-/* BUSCAR.PHP */
-include_once("Objects/HTML.php");
-$html=new HTML($locale);
-echo $html->menuCandidatos();
-
-$tipobusqueda="candidato";
-?>
-<h2><?php echo $locale['820']; ?></h2>
-
-<div id="ContTabul">
-<form action="busqueda_candidato_multiple.php" method="POST" name="form_busqueda_multiple">
-                <?php include_once("formulario_buscar_persona.php"); ?>
-	<table align="center" width="100%" cellspacing="2" cellpadding="2" border="0">
-		<tr>
-			<td class="sinborde" align="center">
-				<input type="submit" name="enviar" value="Buscar" class="button" onclick="return comprobar_busqueda_multiple(this)">
-                <input type="reset" name="borrar" value="Borrar" class="button" >
-			</td>
-        </tr>
-</form>
-</table>
-</div>
-<?php
-include_once("html/pie.php");
-?>

querys.log

@@ -1,868 +0,0 @@
-
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #75
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #83
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #85
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #87
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #89
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #58
-select usuarios.* from usuarios where usuarios.tipo = 'candidato' and usuarios.nombre like '%nombre%' and usuarios.procedencia = '1'  - Resource id #60
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #75
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #83
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #85
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #87
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #89
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #58
-select usuarios.* from usuarios where usuarios.tipo = 'candidato' and usuarios.nombre like '%nombre%' and usuarios.procedencia = '1'  - Resource id #60
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #58
-select usuarios.* from usuarios where usuarios.tipo = 'candidato' and usuarios.nombre like '%nombre%' and usuarios.procedencia = '1'  - Resource id #60
-SELECT oid FROM usuarios WHERE oid = '457' AND tipo='candidato' - Resource id #62
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #64
-SELECT * FROM usuarios WHERE oid="457" - Resource id #70
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #75
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #77
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #79
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #75
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #83
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #85
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #87
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #89
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #58
-select usuarios.* from usuarios where usuarios.tipo = 'candidato' and usuarios.nombre like '%nombre%' and usuarios.procedencia = '1'  - Resource id #60
-SELECT oid FROM usuarios WHERE oid = '457' AND tipo='candidato' - Resource id #62
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #64
-SELECT * FROM usuarios WHERE oid="457" - Resource id #70
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #75
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #77
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #79
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #34
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #41
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #43
-SELECT * FROM opciones - Resource id #45
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #57
-SELECT * from usuarios where tipo = 'candidato' and estado='10'  ORDER BY fecha_modificacion DESC - Resource id #59
-SELECT oid FROM usuarios WHERE oid = '441' AND tipo='candidato' - Resource id #61
-SELECT oid FROM usuarios WHERE oid = '441' - Resource id #63
-SELECT oid FROM usuarios WHERE oid = '442' AND tipo='candidato' - Resource id #65
-SELECT oid FROM usuarios WHERE oid = '442' - Resource id #67
-SELECT oid FROM usuarios WHERE oid = '443' AND tipo='candidato' - Resource id #69
-SELECT oid FROM usuarios WHERE oid = '443' - Resource id #71
-SELECT oid FROM usuarios WHERE oid = '444' AND tipo='candidato' - Resource id #73
-SELECT oid FROM usuarios WHERE oid = '444' - Resource id #75
-SELECT oid FROM usuarios WHERE oid = '445' AND tipo='candidato' - Resource id #77
-SELECT oid FROM usuarios WHERE oid = '445' - Resource id #79
-SELECT oid FROM usuarios WHERE oid = '446' AND tipo='candidato' - Resource id #81
-SELECT oid FROM usuarios WHERE oid = '446' - Resource id #83
-SELECT oid FROM usuarios WHERE oid = '440' AND tipo='candidato' - Resource id #85
-SELECT oid FROM usuarios WHERE oid = '440' - Resource id #87
-SELECT oid FROM usuarios WHERE oid = '439' AND tipo='candidato' - Resource id #89
-SELECT oid FROM usuarios WHERE oid = '439' - Resource id #91
-SELECT oid FROM usuarios WHERE oid = '359' AND tipo='candidato' - Resource id #93
-SELECT oid FROM usuarios WHERE oid = '359' - Resource id #95
-SELECT oid FROM usuarios WHERE oid = '424' AND tipo='candidato' - Resource id #97
-SELECT oid FROM usuarios WHERE oid = '424' - Resource id #99
-SELECT oid FROM usuarios WHERE oid = '436' AND tipo='candidato' - Resource id #101
-SELECT oid FROM usuarios WHERE oid = '436' - Resource id #103
-SELECT oid FROM usuarios WHERE oid = '437' AND tipo='candidato' - Resource id #105
-SELECT oid FROM usuarios WHERE oid = '437' - Resource id #107
-SELECT oid FROM usuarios WHERE oid = '438' AND tipo='candidato' - Resource id #109
-SELECT oid FROM usuarios WHERE oid = '438' - Resource id #111
-SELECT oid FROM usuarios WHERE oid = '433' AND tipo='candidato' - Resource id #113
-SELECT oid FROM usuarios WHERE oid = '433' - Resource id #115
-SELECT oid FROM usuarios WHERE oid = '434' AND tipo='candidato' - Resource id #117
-SELECT oid FROM usuarios WHERE oid = '434' - Resource id #119
-SELECT oid FROM usuarios WHERE oid = '435' AND tipo='candidato' - Resource id #121
-SELECT oid FROM usuarios WHERE oid = '435' - Resource id #123
-SELECT oid FROM usuarios WHERE oid = '430' AND tipo='candidato' - Resource id #125
-SELECT oid FROM usuarios WHERE oid = '430' - Resource id #127
-SELECT oid FROM usuarios WHERE oid = '431' AND tipo='candidato' - Resource id #129
-SELECT oid FROM usuarios WHERE oid = '431' - Resource id #131
-SELECT oid FROM usuarios WHERE oid = '432' AND tipo='candidato' - Resource id #133
-SELECT oid FROM usuarios WHERE oid = '432' - Resource id #135
-SELECT oid FROM usuarios WHERE oid = '427' AND tipo='candidato' - Resource id #137
-SELECT oid FROM usuarios WHERE oid = '427' - Resource id #139
-SELECT oid FROM usuarios WHERE oid = '429' AND tipo='candidato' - Resource id #141
-SELECT oid FROM usuarios WHERE oid = '429' - Resource id #143
-SELECT oid FROM usuarios WHERE oid = '144' AND tipo='candidato' - Resource id #145
-SELECT oid FROM usuarios WHERE oid = '144' - Resource id #147
-SELECT oid FROM usuarios WHERE oid = '422' AND tipo='candidato' - Resource id #149
-SELECT oid FROM usuarios WHERE oid = '422' - Resource id #151
-SELECT oid FROM usuarios WHERE oid = '423' AND tipo='candidato' - Resource id #153
-SELECT oid FROM usuarios WHERE oid = '423' - Resource id #155
-SELECT oid FROM usuarios WHERE oid = '425' AND tipo='candidato' - Resource id #157
-SELECT oid FROM usuarios WHERE oid = '425' - Resource id #159
-SELECT oid FROM usuarios WHERE oid = '426' AND tipo='candidato' - Resource id #161
-SELECT oid FROM usuarios WHERE oid = '426' - Resource id #163
-SELECT oid FROM usuarios WHERE oid = '418' AND tipo='candidato' - Resource id #165
-SELECT oid FROM usuarios WHERE oid = '418' - Resource id #167
-SELECT oid FROM usuarios WHERE oid = '419' AND tipo='candidato' - Resource id #169
-SELECT oid FROM usuarios WHERE oid = '419' - Resource id #171
-SELECT oid FROM usuarios WHERE oid = '420' AND tipo='candidato' - Resource id #173
-SELECT oid FROM usuarios WHERE oid = '420' - Resource id #175
-SELECT oid FROM usuarios WHERE oid = '412' AND tipo='candidato' - Resource id #177
-SELECT oid FROM usuarios WHERE oid = '412' - Resource id #179
-SELECT oid FROM usuarios WHERE oid = '413' AND tipo='candidato' - Resource id #181
-SELECT oid FROM usuarios WHERE oid = '413' - Resource id #183
-SELECT oid FROM usuarios WHERE oid = '414' AND tipo='candidato' - Resource id #185
-SELECT oid FROM usuarios WHERE oid = '414' - Resource id #187
-SELECT oid FROM usuarios WHERE oid = '415' AND tipo='candidato' - Resource id #189
-SELECT oid FROM usuarios WHERE oid = '415' - Resource id #191
-SELECT oid FROM usuarios WHERE oid = '416' AND tipo='candidato' - Resource id #193
-SELECT oid FROM usuarios WHERE oid = '416' - Resource id #195
-SELECT oid FROM usuarios WHERE oid = '407' AND tipo='candidato' - Resource id #197
-SELECT oid FROM usuarios WHERE oid = '407' - Resource id #199
-SELECT oid FROM usuarios WHERE oid = '408' AND tipo='candidato' - Resource id #201
-SELECT oid FROM usuarios WHERE oid = '408' - Resource id #203
-SELECT oid FROM usuarios WHERE oid = '409' AND tipo='candidato' - Resource id #205
-SELECT oid FROM usuarios WHERE oid = '409' - Resource id #207
-SELECT oid FROM usuarios WHERE oid = '410' AND tipo='candidato' - Resource id #209
-SELECT oid FROM usuarios WHERE oid = '410' - Resource id #211
-SELECT oid FROM usuarios WHERE oid = '411' AND tipo='candidato' - Resource id #213
-SELECT oid FROM usuarios WHERE oid = '411' - Resource id #215
-SELECT oid FROM usuarios WHERE oid = '306' AND tipo='candidato' - Resource id #217
-SELECT oid FROM usuarios WHERE oid = '306' - Resource id #219
-SELECT oid FROM usuarios WHERE oid = '405' AND tipo='candidato' - Resource id #221
-SELECT oid FROM usuarios WHERE oid = '405' - Resource id #223
-SELECT oid FROM usuarios WHERE oid = '311' AND tipo='candidato' - Resource id #225
-SELECT oid FROM usuarios WHERE oid = '311' - Resource id #227
-SELECT oid FROM usuarios WHERE oid = '403' AND tipo='candidato' - Resource id #229
-SELECT oid FROM usuarios WHERE oid = '403' - Resource id #231
-SELECT oid FROM usuarios WHERE oid = '404' AND tipo='candidato' - Resource id #233
-SELECT oid FROM usuarios WHERE oid = '404' - Resource id #235
-SELECT oid FROM usuarios WHERE oid = '394' AND tipo='candidato' - Resource id #237
-SELECT oid FROM usuarios WHERE oid = '394' - Resource id #239
-SELECT oid FROM usuarios WHERE oid = '398' AND tipo='candidato' - Resource id #241
-SELECT oid FROM usuarios WHERE oid = '398' - Resource id #243
-SELECT oid FROM usuarios WHERE oid = '399' AND tipo='candidato' - Resource id #245
-SELECT oid FROM usuarios WHERE oid = '399' - Resource id #247
-SELECT oid FROM usuarios WHERE oid = '400' AND tipo='candidato' - Resource id #249
-SELECT oid FROM usuarios WHERE oid = '400' - Resource id #251
-SELECT oid FROM usuarios WHERE oid = '401' AND tipo='candidato' - Resource id #253
-SELECT oid FROM usuarios WHERE oid = '401' - Resource id #255
-SELECT oid FROM usuarios WHERE oid = '402' AND tipo='candidato' - Resource id #257
-SELECT oid FROM usuarios WHERE oid = '402' - Resource id #259
-SELECT oid FROM usuarios WHERE oid = '199' AND tipo='candidato' - Resource id #261
-SELECT oid FROM usuarios WHERE oid = '199' - Resource id #263
-SELECT oid FROM usuarios WHERE oid = '110' AND tipo='candidato' - Resource id #265
-SELECT oid FROM usuarios WHERE oid = '110' - Resource id #267
-SELECT oid FROM usuarios WHERE oid = '390' AND tipo='candidato' - Resource id #269
-SELECT oid FROM usuarios WHERE oid = '390' - Resource id #271
-SELECT oid FROM usuarios WHERE oid = '393' AND tipo='candidato' - Resource id #273
-SELECT oid FROM usuarios WHERE oid = '393' - Resource id #275
-SELECT oid FROM usuarios WHERE oid = '396' AND tipo='candidato' - Resource id #277
-SELECT oid FROM usuarios WHERE oid = '396' - Resource id #279
-SELECT oid FROM usuarios WHERE oid = '397' AND tipo='candidato' - Resource id #281
-SELECT oid FROM usuarios WHERE oid = '397' - Resource id #283
-SELECT oid FROM usuarios WHERE oid = '391' AND tipo='candidato' - Resource id #285
-SELECT oid FROM usuarios WHERE oid = '391' - Resource id #287
-SELECT oid FROM usuarios WHERE oid = '349' AND tipo='candidato' - Resource id #289
-SELECT oid FROM usuarios WHERE oid = '349' - Resource id #291
-SELECT oid FROM usuarios WHERE oid = '384' AND tipo='candidato' - Resource id #293
-SELECT oid FROM usuarios WHERE oid = '384' - Resource id #295
-SELECT oid FROM usuarios WHERE oid = '386' AND tipo='candidato' - Resource id #297
-SELECT oid FROM usuarios WHERE oid = '386' - Resource id #299
-SELECT oid FROM usuarios WHERE oid = '380' AND tipo='candidato' - Resource id #301
-SELECT oid FROM usuarios WHERE oid = '380' - Resource id #303
-SELECT oid FROM usuarios WHERE oid = '382' AND tipo='candidato' - Resource id #305
-SELECT oid FROM usuarios WHERE oid = '382' - Resource id #307
-SELECT oid FROM usuarios WHERE oid = '377' AND tipo='candidato' - Resource id #309
-SELECT oid FROM usuarios WHERE oid = '377' - Resource id #311
-SELECT oid FROM usuarios WHERE oid = '378' AND tipo='candidato' - Resource id #313
-SELECT oid FROM usuarios WHERE oid = '378' - Resource id #315
-SELECT oid FROM usuarios WHERE oid = '379' AND tipo='candidato' - Resource id #317
-SELECT oid FROM usuarios WHERE oid = '379' - Resource id #319
-SELECT oid FROM usuarios WHERE oid = '370' AND tipo='candidato' - Resource id #321
-SELECT oid FROM usuarios WHERE oid = '370' - Resource id #323
-SELECT oid FROM usuarios WHERE oid = '371' AND tipo='candidato' - Resource id #325
-SELECT oid FROM usuarios WHERE oid = '371' - Resource id #327
-SELECT oid FROM usuarios WHERE oid = '373' AND tipo='candidato' - Resource id #329
-SELECT oid FROM usuarios WHERE oid = '373' - Resource id #331
-SELECT oid FROM usuarios WHERE oid = '374' AND tipo='candidato' - Resource id #333
-SELECT oid FROM usuarios WHERE oid = '374' - Resource id #335
-SELECT oid FROM usuarios WHERE oid = '375' AND tipo='candidato' - Resource id #337
-SELECT oid FROM usuarios WHERE oid = '375' - Resource id #339
-SELECT oid FROM usuarios WHERE oid = '178' AND tipo='candidato' - Resource id #341
-SELECT oid FROM usuarios WHERE oid = '178' - Resource id #343
-SELECT oid FROM usuarios WHERE oid = '292' AND tipo='candidato' - Resource id #345
-SELECT oid FROM usuarios WHERE oid = '292' - Resource id #347
-SELECT oid FROM usuarios WHERE oid = '369' AND tipo='candidato' - Resource id #349
-SELECT oid FROM usuarios WHERE oid = '369' - Resource id #351
-SELECT oid FROM usuarios WHERE oid = '368' AND tipo='candidato' - Resource id #353
-SELECT oid FROM usuarios WHERE oid = '368' - Resource id #355
-SELECT oid FROM usuarios WHERE oid = '357' AND tipo='candidato' - Resource id #357
-SELECT oid FROM usuarios WHERE oid = '357' - Resource id #359
-SELECT oid FROM usuarios WHERE oid = '360' AND tipo='candidato' - Resource id #361
-SELECT oid FROM usuarios WHERE oid = '360' - Resource id #363
-SELECT oid FROM usuarios WHERE oid = '361' AND tipo='candidato' - Resource id #365
-SELECT oid FROM usuarios WHERE oid = '361' - Resource id #367
-SELECT oid FROM usuarios WHERE oid = '363' AND tipo='candidato' - Resource id #369
-SELECT oid FROM usuarios WHERE oid = '363' - Resource id #371
-SELECT oid FROM usuarios WHERE oid = '356' AND tipo='candidato' - Resource id #373
-SELECT oid FROM usuarios WHERE oid = '356' - Resource id #375
-SELECT oid FROM usuarios WHERE oid = '351' AND tipo='candidato' - Resource id #377
-SELECT oid FROM usuarios WHERE oid = '351' - Resource id #379
-SELECT oid FROM usuarios WHERE oid = '352' AND tipo='candidato' - Resource id #381
-SELECT oid FROM usuarios WHERE oid = '352' - Resource id #383
-SELECT oid FROM usuarios WHERE oid = '353' AND tipo='candidato' - Resource id #385
-SELECT oid FROM usuarios WHERE oid = '353' - Resource id #387
-SELECT oid FROM usuarios WHERE oid = '354' AND tipo='candidato' - Resource id #389
-SELECT oid FROM usuarios WHERE oid = '354' - Resource id #391
-SELECT oid FROM usuarios WHERE oid = '346' AND tipo='candidato' - Resource id #393
-SELECT oid FROM usuarios WHERE oid = '346' - Resource id #395
-SELECT oid FROM usuarios WHERE oid = '347' AND tipo='candidato' - Resource id #397
-SELECT oid FROM usuarios WHERE oid = '347' - Resource id #399
-SELECT oid FROM usuarios WHERE oid = '348' AND tipo='candidato' - Resource id #401
-SELECT oid FROM usuarios WHERE oid = '348' - Resource id #403
-SELECT oid FROM usuarios WHERE oid = '350' AND tipo='candidato' - Resource id #405
-SELECT oid FROM usuarios WHERE oid = '350' - Resource id #407
-SELECT oid FROM usuarios WHERE oid = '335' AND tipo='candidato' - Resource id #409
-SELECT oid FROM usuarios WHERE oid = '335' - Resource id #411
-SELECT oid FROM usuarios WHERE oid = '336' AND tipo='candidato' - Resource id #413
-SELECT oid FROM usuarios WHERE oid = '336' - Resource id #415
-SELECT oid FROM usuarios WHERE oid = '337' AND tipo='candidato' - Resource id #417
-SELECT oid FROM usuarios WHERE oid = '337' - Resource id #419
-SELECT oid FROM usuarios WHERE oid = '339' AND tipo='candidato' - Resource id #421
-SELECT oid FROM usuarios WHERE oid = '339' - Resource id #423
-SELECT oid FROM usuarios WHERE oid = '340' AND tipo='candidato' - Resource id #425
-SELECT oid FROM usuarios WHERE oid = '340' - Resource id #427
-SELECT oid FROM usuarios WHERE oid = '342' AND tipo='candidato' - Resource id #429
-SELECT oid FROM usuarios WHERE oid = '342' - Resource id #431
-SELECT oid FROM usuarios WHERE oid = '343' AND tipo='candidato' - Resource id #433
-SELECT oid FROM usuarios WHERE oid = '343' - Resource id #435
-SELECT oid FROM usuarios WHERE oid = '314' AND tipo='candidato' - Resource id #437
-SELECT oid FROM usuarios WHERE oid = '314' - Resource id #439
-SELECT oid FROM usuarios WHERE oid = '323' AND tipo='candidato' - Resource id #441
-SELECT oid FROM usuarios WHERE oid = '323' - Resource id #443
-SELECT oid FROM usuarios WHERE oid = '324' AND tipo='candidato' - Resource id #445
-SELECT oid FROM usuarios WHERE oid = '324' - Resource id #447
-SELECT oid FROM usuarios WHERE oid = '325' AND tipo='candidato' - Resource id #449
-SELECT oid FROM usuarios WHERE oid = '325' - Resource id #451
-SELECT oid FROM usuarios WHERE oid = '326' AND tipo='candidato' - Resource id #453
-SELECT oid FROM usuarios WHERE oid = '326' - Resource id #455
-SELECT oid FROM usuarios WHERE oid = '327' AND tipo='candidato' - Resource id #457
-SELECT oid FROM usuarios WHERE oid = '327' - Resource id #459
-SELECT oid FROM usuarios WHERE oid = '328' AND tipo='candidato' - Resource id #461
-SELECT oid FROM usuarios WHERE oid = '328' - Resource id #463
-SELECT oid FROM usuarios WHERE oid = '329' AND tipo='candidato' - Resource id #465
-SELECT oid FROM usuarios WHERE oid = '329' - Resource id #467
-SELECT oid FROM usuarios WHERE oid = '330' AND tipo='candidato' - Resource id #469
-SELECT oid FROM usuarios WHERE oid = '330' - Resource id #471
-SELECT oid FROM usuarios WHERE oid = '331' AND tipo='candidato' - Resource id #473
-SELECT oid FROM usuarios WHERE oid = '331' - Resource id #475
-SELECT oid FROM usuarios WHERE oid = '332' AND tipo='candidato' - Resource id #477
-SELECT oid FROM usuarios WHERE oid = '332' - Resource id #479
-SELECT oid FROM usuarios WHERE oid = '334' AND tipo='candidato' - Resource id #481
-SELECT oid FROM usuarios WHERE oid = '334' - Resource id #483
-SELECT oid FROM usuarios WHERE oid = '316' AND tipo='candidato' - Resource id #485
-SELECT oid FROM usuarios WHERE oid = '316' - Resource id #487
-SELECT oid FROM usuarios WHERE oid = '317' AND tipo='candidato' - Resource id #489
-SELECT oid FROM usuarios WHERE oid = '317' - Resource id #491
-SELECT oid FROM usuarios WHERE oid = '318' AND tipo='candidato' - Resource id #493
-SELECT oid FROM usuarios WHERE oid = '318' - Resource id #495
-SELECT oid FROM usuarios WHERE oid = '320' AND tipo='candidato' - Resource id #497
-SELECT oid FROM usuarios WHERE oid = '320' - Resource id #499
-SELECT oid FROM usuarios WHERE oid = '321' AND tipo='candidato' - Resource id #501
-SELECT oid FROM usuarios WHERE oid = '321' - Resource id #503
-SELECT oid FROM usuarios WHERE oid = '307' AND tipo='candidato' - Resource id #505
-SELECT oid FROM usuarios WHERE oid = '307' - Resource id #507
-SELECT oid FROM usuarios WHERE oid = '308' AND tipo='candidato' - Resource id #509
-SELECT oid FROM usuarios WHERE oid = '308' - Resource id #511
-SELECT oid FROM usuarios WHERE oid = '224' AND tipo='candidato' - Resource id #513
-SELECT oid FROM usuarios WHERE oid = '224' - Resource id #515
-SELECT oid FROM usuarios WHERE oid = '262' AND tipo='candidato' - Resource id #517
-SELECT oid FROM usuarios WHERE oid = '262' - Resource id #519
-SELECT oid FROM usuarios WHERE oid = '300' AND tipo='candidato' - Resource id #521
-SELECT oid FROM usuarios WHERE oid = '300' - Resource id #523
-SELECT oid FROM usuarios WHERE oid = '301' AND tipo='candidato' - Resource id #525
-SELECT oid FROM usuarios WHERE oid = '301' - Resource id #527
-SELECT oid FROM usuarios WHERE oid = '302' AND tipo='candidato' - Resource id #529
-SELECT oid FROM usuarios WHERE oid = '302' - Resource id #531
-SELECT oid FROM usuarios WHERE oid = '303' AND tipo='candidato' - Resource id #533
-SELECT oid FROM usuarios WHERE oid = '303' - Resource id #535
-SELECT oid FROM usuarios WHERE oid = '203' AND tipo='candidato' - Resource id #537
-SELECT oid FROM usuarios WHERE oid = '203' - Resource id #539
-SELECT oid FROM usuarios WHERE oid = '222' AND tipo='candidato' - Resource id #541
-SELECT oid FROM usuarios WHERE oid = '222' - Resource id #543
-SELECT oid FROM usuarios WHERE oid = '289' AND tipo='candidato' - Resource id #545
-SELECT oid FROM usuarios WHERE oid = '289' - Resource id #547
-SELECT oid FROM usuarios WHERE oid = '290' AND tipo='candidato' - Resource id #549
-SELECT oid FROM usuarios WHERE oid = '290' - Resource id #551
-SELECT oid FROM usuarios WHERE oid = '291' AND tipo='candidato' - Resource id #553
-SELECT oid FROM usuarios WHERE oid = '291' - Resource id #555
-SELECT oid FROM usuarios WHERE oid = '294' AND tipo='candidato' - Resource id #557
-SELECT oid FROM usuarios WHERE oid = '294' - Resource id #559
-SELECT oid FROM usuarios WHERE oid = '298' AND tipo='candidato' - Resource id #561
-SELECT oid FROM usuarios WHERE oid = '298' - Resource id #563
-SELECT oid FROM usuarios WHERE oid = '299' AND tipo='candidato' - Resource id #565
-SELECT oid FROM usuarios WHERE oid = '299' - Resource id #567
-SELECT oid FROM usuarios WHERE oid = '284' AND tipo='candidato' - Resource id #569
-SELECT oid FROM usuarios WHERE oid = '284' - Resource id #571
-SELECT oid FROM usuarios WHERE oid = '285' AND tipo='candidato' - Resource id #573
-SELECT oid FROM usuarios WHERE oid = '285' - Resource id #575
-SELECT oid FROM usuarios WHERE oid = '286' AND tipo='candidato' - Resource id #577
-SELECT oid FROM usuarios WHERE oid = '286' - Resource id #579
-SELECT oid FROM usuarios WHERE oid = '287' AND tipo='candidato' - Resource id #581
-SELECT oid FROM usuarios WHERE oid = '287' - Resource id #583
-SELECT oid FROM usuarios WHERE oid = '288' AND tipo='candidato' - Resource id #585
-SELECT oid FROM usuarios WHERE oid = '288' - Resource id #587
-SELECT oid FROM usuarios WHERE oid = '278' AND tipo='candidato' - Resource id #589
-SELECT oid FROM usuarios WHERE oid = '278' - Resource id #591
-SELECT oid FROM usuarios WHERE oid = '279' AND tipo='candidato' - Resource id #593
-SELECT oid FROM usuarios WHERE oid = '279' - Resource id #595
-SELECT oid FROM usuarios WHERE oid = '281' AND tipo='candidato' - Resource id #597
-SELECT oid FROM usuarios WHERE oid = '281' - Resource id #599
-SELECT oid FROM usuarios WHERE oid = '282' AND tipo='candidato' - Resource id #601
-SELECT oid FROM usuarios WHERE oid = '282' - Resource id #603
-SELECT oid FROM usuarios WHERE oid = '269' AND tipo='candidato' - Resource id #605
-SELECT oid FROM usuarios WHERE oid = '269' - Resource id #607
-SELECT oid FROM usuarios WHERE oid = '271' AND tipo='candidato' - Resource id #609
-SELECT oid FROM usuarios WHERE oid = '271' - Resource id #611
-SELECT oid FROM usuarios WHERE oid = '272' AND tipo='candidato' - Resource id #613
-SELECT oid FROM usuarios WHERE oid = '272' - Resource id #615
-SELECT oid FROM usuarios WHERE oid = '273' AND tipo='candidato' - Resource id #617
-SELECT oid FROM usuarios WHERE oid = '273' - Resource id #619
-SELECT oid FROM usuarios WHERE oid = '274' AND tipo='candidato' - Resource id #621
-SELECT oid FROM usuarios WHERE oid = '274' - Resource id #623
-SELECT oid FROM usuarios WHERE oid = '276' AND tipo='candidato' - Resource id #625
-SELECT oid FROM usuarios WHERE oid = '276' - Resource id #627
-SELECT oid FROM usuarios WHERE oid = '212' AND tipo='candidato' - Resource id #629
-SELECT oid FROM usuarios WHERE oid = '212' - Resource id #631
-SELECT oid FROM usuarios WHERE oid = '266' AND tipo='candidato' - Resource id #633
-SELECT oid FROM usuarios WHERE oid = '266' - Resource id #635
-SELECT oid FROM usuarios WHERE oid = '267' AND tipo='candidato' - Resource id #637
-SELECT oid FROM usuarios WHERE oid = '267' - Resource id #639
-SELECT oid FROM usuarios WHERE oid = '268' AND tipo='candidato' - Resource id #641
-SELECT oid FROM usuarios WHERE oid = '268' - Resource id #643
-SELECT oid FROM usuarios WHERE oid = '228' AND tipo='candidato' - Resource id #645
-SELECT oid FROM usuarios WHERE oid = '228' - Resource id #647
-SELECT oid FROM usuarios WHERE oid = '260' AND tipo='candidato' - Resource id #649
-SELECT oid FROM usuarios WHERE oid = '260' - Resource id #651
-SELECT oid FROM usuarios WHERE oid = '263' AND tipo='candidato' - Resource id #653
-SELECT oid FROM usuarios WHERE oid = '263' - Resource id #655
-SELECT oid FROM usuarios WHERE oid = '264' AND tipo='candidato' - Resource id #657
-SELECT oid FROM usuarios WHERE oid = '264' - Resource id #659
-SELECT oid FROM usuarios WHERE oid = '265' AND tipo='candidato' - Resource id #661
-SELECT oid FROM usuarios WHERE oid = '265' - Resource id #663
-SELECT oid FROM usuarios WHERE oid = '256' AND tipo='candidato' - Resource id #665
-SELECT oid FROM usuarios WHERE oid = '256' - Resource id #667
-SELECT oid FROM usuarios WHERE oid = '257' AND tipo='candidato' - Resource id #669
-SELECT oid FROM usuarios WHERE oid = '257' - Resource id #671
-SELECT oid FROM usuarios WHERE oid = '255' AND tipo='candidato' - Resource id #673
-SELECT oid FROM usuarios WHERE oid = '255' - Resource id #675
-SELECT oid FROM usuarios WHERE oid = '241' AND tipo='candidato' - Resource id #677
-SELECT oid FROM usuarios WHERE oid = '241' - Resource id #679
-SELECT oid FROM usuarios WHERE oid = '248' AND tipo='candidato' - Resource id #681
-SELECT oid FROM usuarios WHERE oid = '248' - Resource id #683
-SELECT oid FROM usuarios WHERE oid = '252' AND tipo='candidato' - Resource id #685
-SELECT oid FROM usuarios WHERE oid = '252' - Resource id #687
-SELECT oid FROM usuarios WHERE oid = '253' AND tipo='candidato' - Resource id #689
-SELECT oid FROM usuarios WHERE oid = '253' - Resource id #691
-SELECT oid FROM usuarios WHERE oid = '247' AND tipo='candidato' - Resource id #693
-SELECT oid FROM usuarios WHERE oid = '247' - Resource id #695
-SELECT oid FROM usuarios WHERE oid = '249' AND tipo='candidato' - Resource id #697
-SELECT oid FROM usuarios WHERE oid = '249' - Resource id #699
-SELECT oid FROM usuarios WHERE oid = '250' AND tipo='candidato' - Resource id #701
-SELECT oid FROM usuarios WHERE oid = '250' - Resource id #703
-SELECT oid FROM usuarios WHERE oid = '242' AND tipo='candidato' - Resource id #705
-SELECT oid FROM usuarios WHERE oid = '242' - Resource id #707
-SELECT oid FROM usuarios WHERE oid = '243' AND tipo='candidato' - Resource id #709
-SELECT oid FROM usuarios WHERE oid = '243' - Resource id #711
-SELECT oid FROM usuarios WHERE oid = '244' AND tipo='candidato' - Resource id #713
-SELECT oid FROM usuarios WHERE oid = '244' - Resource id #715
-SELECT oid FROM usuarios WHERE oid = '245' AND tipo='candidato' - Resource id #717
-SELECT oid FROM usuarios WHERE oid = '245' - Resource id #719
-SELECT oid FROM usuarios WHERE oid = '246' AND tipo='candidato' - Resource id #721
-SELECT oid FROM usuarios WHERE oid = '246' - Resource id #723
-SELECT oid FROM usuarios WHERE oid = '237' AND tipo='candidato' - Resource id #725
-SELECT oid FROM usuarios WHERE oid = '237' - Resource id #727
-SELECT oid FROM usuarios WHERE oid = '238' AND tipo='candidato' - Resource id #729
-SELECT oid FROM usuarios WHERE oid = '238' - Resource id #731
-SELECT oid FROM usuarios WHERE oid = '239' AND tipo='candidato' - Resource id #733
-SELECT oid FROM usuarios WHERE oid = '239' - Resource id #735
-SELECT oid FROM usuarios WHERE oid = '229' AND tipo='candidato' - Resource id #737
-SELECT oid FROM usuarios WHERE oid = '229' - Resource id #739
-SELECT oid FROM usuarios WHERE oid = '233' AND tipo='candidato' - Resource id #741
-SELECT oid FROM usuarios WHERE oid = '233' - Resource id #743
-SELECT oid FROM usuarios WHERE oid = '236' AND tipo='candidato' - Resource id #745
-SELECT oid FROM usuarios WHERE oid = '236' - Resource id #747
-SELECT oid FROM usuarios WHERE oid = '223' AND tipo='candidato' - Resource id #749
-SELECT oid FROM usuarios WHERE oid = '223' - Resource id #751
-SELECT oid FROM usuarios WHERE oid = '225' AND tipo='candidato' - Resource id #753
-SELECT oid FROM usuarios WHERE oid = '225' - Resource id #755
-SELECT oid FROM usuarios WHERE oid = '226' AND tipo='candidato' - Resource id #757
-SELECT oid FROM usuarios WHERE oid = '226' - Resource id #759
-SELECT oid FROM usuarios WHERE oid = '227' AND tipo='candidato' - Resource id #761
-SELECT oid FROM usuarios WHERE oid = '227' - Resource id #763
-SELECT oid FROM usuarios WHERE oid = '218' AND tipo='candidato' - Resource id #765
-SELECT oid FROM usuarios WHERE oid = '218' - Resource id #767
-SELECT oid FROM usuarios WHERE oid = '219' AND tipo='candidato' - Resource id #769
-SELECT oid FROM usuarios WHERE oid = '219' - Resource id #771
-SELECT oid FROM usuarios WHERE oid = '211' AND tipo='candidato' - Resource id #773
-SELECT oid FROM usuarios WHERE oid = '211' - Resource id #775
-SELECT oid FROM usuarios WHERE oid = '209' AND tipo='candidato' - Resource id #777
-SELECT oid FROM usuarios WHERE oid = '209' - Resource id #779
-SELECT oid FROM usuarios WHERE oid = '153' AND tipo='candidato' - Resource id #781
-SELECT oid FROM usuarios WHERE oid = '153' - Resource id #783
-SELECT oid FROM usuarios WHERE oid = '210' AND tipo='candidato' - Resource id #785
-SELECT oid FROM usuarios WHERE oid = '210' - Resource id #787
-SELECT oid FROM usuarios WHERE oid = '213' AND tipo='candidato' - Resource id #789
-SELECT oid FROM usuarios WHERE oid = '213' - Resource id #791
-SELECT oid FROM usuarios WHERE oid = '214' AND tipo='candidato' - Resource id #793
-SELECT oid FROM usuarios WHERE oid = '214' - Resource id #795
-SELECT oid FROM usuarios WHERE oid = '188' AND tipo='candidato' - Resource id #797
-SELECT oid FROM usuarios WHERE oid = '188' - Resource id #799
-SELECT oid FROM usuarios WHERE oid = '205' AND tipo='candidato' - Resource id #801
-SELECT oid FROM usuarios WHERE oid = '205' - Resource id #803
-SELECT oid FROM usuarios WHERE oid = '206' AND tipo='candidato' - Resource id #805
-SELECT oid FROM usuarios WHERE oid = '206' - Resource id #807
-SELECT oid FROM usuarios WHERE oid = '207' AND tipo='candidato' - Resource id #809
-SELECT oid FROM usuarios WHERE oid = '207' - Resource id #811
-SELECT oid FROM usuarios WHERE oid = '202' AND tipo='candidato' - Resource id #813
-SELECT oid FROM usuarios WHERE oid = '202' - Resource id #815
-SELECT oid FROM usuarios WHERE oid = '192' AND tipo='candidato' - Resource id #817
-SELECT oid FROM usuarios WHERE oid = '192' - Resource id #819
-SELECT oid FROM usuarios WHERE oid = '193' AND tipo='candidato' - Resource id #821
-SELECT oid FROM usuarios WHERE oid = '193' - Resource id #823
-SELECT oid FROM usuarios WHERE oid = '194' AND tipo='candidato' - Resource id #825
-SELECT oid FROM usuarios WHERE oid = '194' - Resource id #827
-SELECT oid FROM usuarios WHERE oid = '196' AND tipo='candidato' - Resource id #829
-SELECT oid FROM usuarios WHERE oid = '196' - Resource id #831
-SELECT oid FROM usuarios WHERE oid = '197' AND tipo='candidato' - Resource id #833
-SELECT oid FROM usuarios WHERE oid = '197' - Resource id #835
-SELECT oid FROM usuarios WHERE oid = '198' AND tipo='candidato' - Resource id #837
-SELECT oid FROM usuarios WHERE oid = '198' - Resource id #839
-SELECT oid FROM usuarios WHERE oid = '200' AND tipo='candidato' - Resource id #841
-SELECT oid FROM usuarios WHERE oid = '200' - Resource id #843
-SELECT oid FROM usuarios WHERE oid = '201' AND tipo='candidato' - Resource id #845
-SELECT oid FROM usuarios WHERE oid = '201' - Resource id #847
-SELECT oid FROM usuarios WHERE oid = '189' AND tipo='candidato' - Resource id #849
-SELECT oid FROM usuarios WHERE oid = '189' - Resource id #851
-SELECT oid FROM usuarios WHERE oid = '190' AND tipo='candidato' - Resource id #853
-SELECT oid FROM usuarios WHERE oid = '190' - Resource id #855
-SELECT oid FROM usuarios WHERE oid = '187' AND tipo='candidato' - Resource id #857
-SELECT oid FROM usuarios WHERE oid = '187' - Resource id #859
-SELECT oid FROM usuarios WHERE oid = '186' AND tipo='candidato' - Resource id #861
-SELECT oid FROM usuarios WHERE oid = '186' - Resource id #863
-SELECT oid FROM usuarios WHERE oid = '180' AND tipo='candidato' - Resource id #865
-SELECT oid FROM usuarios WHERE oid = '180' - Resource id #867
-SELECT oid FROM usuarios WHERE oid = '181' AND tipo='candidato' - Resource id #869
-SELECT oid FROM usuarios WHERE oid = '181' - Resource id #871
-SELECT oid FROM usuarios WHERE oid = '183' AND tipo='candidato' - Resource id #873
-SELECT oid FROM usuarios WHERE oid = '183' - Resource id #875
-SELECT oid FROM usuarios WHERE oid = '184' AND tipo='candidato' - Resource id #877
-SELECT oid FROM usuarios WHERE oid = '184' - Resource id #879
-SELECT oid FROM usuarios WHERE oid = '177' AND tipo='candidato' - Resource id #881
-SELECT oid FROM usuarios WHERE oid = '177' - Resource id #883
-SELECT oid FROM usuarios WHERE oid = '174' AND tipo='candidato' - Resource id #885
-SELECT oid FROM usuarios WHERE oid = '174' - Resource id #887
-SELECT oid FROM usuarios WHERE oid = '175' AND tipo='candidato' - Resource id #889
-SELECT oid FROM usuarios WHERE oid = '175' - Resource id #891
-SELECT oid FROM usuarios WHERE oid = '169' AND tipo='candidato' - Resource id #893
-SELECT oid FROM usuarios WHERE oid = '169' - Resource id #895
-SELECT oid FROM usuarios WHERE oid = '170' AND tipo='candidato' - Resource id #897
-SELECT oid FROM usuarios WHERE oid = '170' - Resource id #899
-SELECT oid FROM usuarios WHERE oid = '171' AND tipo='candidato' - Resource id #901
-SELECT oid FROM usuarios WHERE oid = '171' - Resource id #903
-SELECT oid FROM usuarios WHERE oid = '172' AND tipo='candidato' - Resource id #905
-SELECT oid FROM usuarios WHERE oid = '172' - Resource id #907
-SELECT oid FROM usuarios WHERE oid = '173' AND tipo='candidato' - Resource id #909
-SELECT oid FROM usuarios WHERE oid = '173' - Resource id #911
-SELECT oid FROM usuarios WHERE oid = '167' AND tipo='candidato' - Resource id #913
-SELECT oid FROM usuarios WHERE oid = '167' - Resource id #915
-SELECT oid FROM usuarios WHERE oid = '163' AND tipo='candidato' - Resource id #917
-SELECT oid FROM usuarios WHERE oid = '163' - Resource id #919
-SELECT oid FROM usuarios WHERE oid = '73' AND tipo='candidato' - Resource id #921
-SELECT oid FROM usuarios WHERE oid = '73' - Resource id #923
-SELECT oid FROM usuarios WHERE oid = '103' AND tipo='candidato' - Resource id #925
-SELECT oid FROM usuarios WHERE oid = '103' - Resource id #927
-SELECT oid FROM usuarios WHERE oid = '140' AND tipo='candidato' - Resource id #929
-SELECT oid FROM usuarios WHERE oid = '140' - Resource id #931
-SELECT oid FROM usuarios WHERE oid = '162' AND tipo='candidato' - Resource id #933
-SELECT oid FROM usuarios WHERE oid = '162' - Resource id #935
-SELECT oid FROM usuarios WHERE oid = '161' AND tipo='candidato' - Resource id #937
-SELECT oid FROM usuarios WHERE oid = '161' - Resource id #939
-SELECT oid FROM usuarios WHERE oid = '160' AND tipo='candidato' - Resource id #941
-SELECT oid FROM usuarios WHERE oid = '160' - Resource id #943
-SELECT oid FROM usuarios WHERE oid = '135' AND tipo='candidato' - Resource id #945
-SELECT oid FROM usuarios WHERE oid = '135' - Resource id #947
-SELECT oid FROM usuarios WHERE oid = '152' AND tipo='candidato' - Resource id #949
-SELECT oid FROM usuarios WHERE oid = '152' - Resource id #951
-SELECT oid FROM usuarios WHERE oid = '158' AND tipo='candidato' - Resource id #953
-SELECT oid FROM usuarios WHERE oid = '158' - Resource id #955
-SELECT oid FROM usuarios WHERE oid = '151' AND tipo='candidato' - Resource id #957
-SELECT oid FROM usuarios WHERE oid = '151' - Resource id #959
-SELECT oid FROM usuarios WHERE oid = '145' AND tipo='candidato' - Resource id #961
-SELECT oid FROM usuarios WHERE oid = '145' - Resource id #963
-SELECT oid FROM usuarios WHERE oid = '146' AND tipo='candidato' - Resource id #965
-SELECT oid FROM usuarios WHERE oid = '146' - Resource id #967
-SELECT oid FROM usuarios WHERE oid = '148' AND tipo='candidato' - Resource id #969
-SELECT oid FROM usuarios WHERE oid = '148' - Resource id #971
-SELECT oid FROM usuarios WHERE oid = '149' AND tipo='candidato' - Resource id #973
-SELECT oid FROM usuarios WHERE oid = '149' - Resource id #975
-SELECT oid FROM usuarios WHERE oid = '137' AND tipo='candidato' - Resource id #977
-SELECT oid FROM usuarios WHERE oid = '137' - Resource id #979
-SELECT oid FROM usuarios WHERE oid = '138' AND tipo='candidato' - Resource id #981
-SELECT oid FROM usuarios WHERE oid = '138' - Resource id #983
-SELECT oid FROM usuarios WHERE oid = '139' AND tipo='candidato' - Resource id #985
-SELECT oid FROM usuarios WHERE oid = '139' - Resource id #987
-SELECT oid FROM usuarios WHERE oid = '141' AND tipo='candidato' - Resource id #989
-SELECT oid FROM usuarios WHERE oid = '141' - Resource id #991
-SELECT oid FROM usuarios WHERE oid = '131' AND tipo='candidato' - Resource id #993
-SELECT oid FROM usuarios WHERE oid = '131' - Resource id #995
-SELECT oid FROM usuarios WHERE oid = '132' AND tipo='candidato' - Resource id #997
-SELECT oid FROM usuarios WHERE oid = '132' - Resource id #999
-SELECT oid FROM usuarios WHERE oid = '112' AND tipo='candidato' - Resource id #1001
-SELECT oid FROM usuarios WHERE oid = '112' - Resource id #1003
-SELECT oid FROM usuarios WHERE oid = '108' AND tipo='candidato' - Resource id #1005
-SELECT oid FROM usuarios WHERE oid = '108' - Resource id #1007
-SELECT oid FROM usuarios WHERE oid = '97' AND tipo='candidato' - Resource id #1009
-SELECT oid FROM usuarios WHERE oid = '97' - Resource id #1011
-SELECT oid FROM usuarios WHERE oid = '105' AND tipo='candidato' - Resource id #1013
-SELECT oid FROM usuarios WHERE oid = '105' - Resource id #1015
-SELECT oid FROM usuarios WHERE oid = '94' AND tipo='candidato' - Resource id #1017
-SELECT oid FROM usuarios WHERE oid = '94' - Resource id #1019
-SELECT oid FROM usuarios WHERE oid = '41' AND tipo='candidato' - Resource id #1021
-SELECT oid FROM usuarios WHERE oid = '41' - Resource id #1023
-SELECT oid FROM usuarios WHERE oid = '45' AND tipo='candidato' - Resource id #1025
-SELECT oid FROM usuarios WHERE oid = '45' - Resource id #1027
-SELECT oid FROM usuarios WHERE oid = '76' AND tipo='candidato' - Resource id #1029
-SELECT oid FROM usuarios WHERE oid = '76' - Resource id #1031
-SELECT oid FROM usuarios WHERE oid = '77' AND tipo='candidato' - Resource id #1033
-SELECT oid FROM usuarios WHERE oid = '77' - Resource id #1035
-SELECT oid FROM usuarios WHERE oid = '78' AND tipo='candidato' - Resource id #1037
-SELECT oid FROM usuarios WHERE oid = '78' - Resource id #1039
-SELECT oid FROM usuarios WHERE oid = '46' AND tipo='candidato' - Resource id #1041
-SELECT oid FROM usuarios WHERE oid = '46' - Resource id #1043
-SELECT oid FROM usuarios WHERE oid = '63' AND tipo='candidato' - Resource id #1045
-SELECT oid FROM usuarios WHERE oid = '63' - Resource id #1047
-SELECT oid FROM usuarios WHERE oid = '47' AND tipo='candidato' - Resource id #1049
-SELECT oid FROM usuarios WHERE oid = '47' - Resource id #1051
-SELECT oid FROM usuarios WHERE oid = '49' AND tipo='candidato' - Resource id #1053
-SELECT oid FROM usuarios WHERE oid = '49' - Resource id #1055
-SELECT oid FROM usuarios WHERE oid = '51' AND tipo='candidato' - Resource id #1057
-SELECT oid FROM usuarios WHERE oid = '51' - Resource id #1059
-SELECT * FROM usuarios WHERE oid="441" - Resource id #1067
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '441' and pu.perfil = p.oid - Resource id #1072
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '441' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1074
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '441' and lu.provincia = l.oid - Resource id #1076
-SELECT * FROM usuarios WHERE oid="442" - Resource id #1078
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '442' and pu.perfil = p.oid - Resource id #1083
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '442' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1085
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '442' and lu.provincia = l.oid - Resource id #1087
-SELECT * FROM usuarios WHERE oid="443" - Resource id #1089
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '443' and pu.perfil = p.oid - Resource id #1094
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '443' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1096
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '443' and lu.provincia = l.oid - Resource id #1098
-SELECT * FROM usuarios WHERE oid="444" - Resource id #1100
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '444' and pu.perfil = p.oid - Resource id #1105
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '444' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1107
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '444' and lu.provincia = l.oid - Resource id #1109
-SELECT * FROM usuarios WHERE oid="445" - Resource id #1111
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '445' and pu.perfil = p.oid - Resource id #1116
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '445' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1118
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '445' and lu.provincia = l.oid - Resource id #1120
-SELECT * FROM usuarios WHERE oid="446" - Resource id #1122
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '446' and pu.perfil = p.oid - Resource id #1127
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '446' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1129
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '446' and lu.provincia = l.oid - Resource id #1131
-SELECT * FROM usuarios WHERE oid="440" - Resource id #1133
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '440' and pu.perfil = p.oid - Resource id #1138
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '440' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1140
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '440' and lu.provincia = l.oid - Resource id #1142
-SELECT * FROM usuarios WHERE oid="439" - Resource id #1144
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '439' and pu.perfil = p.oid - Resource id #1149
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '439' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1151
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '439' and lu.provincia = l.oid - Resource id #1153
-SELECT * FROM usuarios WHERE oid="359" - Resource id #1155
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '359' and pu.perfil = p.oid - Resource id #1160
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '359' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1162
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '359' and lu.provincia = l.oid - Resource id #1164
-SELECT * FROM usuarios WHERE oid="424" - Resource id #1166
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '424' and pu.perfil = p.oid - Resource id #1171
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '424' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1173
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '424' and lu.provincia = l.oid - Resource id #1175
-SELECT * FROM usuarios WHERE oid="436" - Resource id #1177
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '436' and pu.perfil = p.oid - Resource id #1182
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '436' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1184
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '436' and lu.provincia = l.oid - Resource id #1186
-SELECT * FROM usuarios WHERE oid="437" - Resource id #1188
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '437' and pu.perfil = p.oid - Resource id #1193
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '437' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1195
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '437' and lu.provincia = l.oid - Resource id #1197
-SELECT * FROM usuarios WHERE oid="438" - Resource id #1199
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '438' and pu.perfil = p.oid - Resource id #1204
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '438' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1206
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '438' and lu.provincia = l.oid - Resource id #1208
-SELECT * FROM usuarios WHERE oid="433" - Resource id #1210
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '433' and pu.perfil = p.oid - Resource id #1215
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '433' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1217
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '433' and lu.provincia = l.oid - Resource id #1219
-SELECT * FROM usuarios WHERE oid="434" - Resource id #1221
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '434' and pu.perfil = p.oid - Resource id #1226
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '434' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #1228
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '434' and lu.provincia = l.oid - Resource id #1230
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #75
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #83
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #85
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #87
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #89
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #58
-select usuarios.* from usuarios where usuarios.tipo = 'candidato' and usuarios.nombre like '%nombre%' and usuarios.procedencia = '1'  - Resource id #60
-SELECT oid FROM usuarios WHERE oid = '457' AND tipo='candidato' - Resource id #62
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #64
-SELECT * FROM usuarios WHERE oid="457" - Resource id #70
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #75
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #77
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #79
-select mutex,tiempo from usuarios where oid = '457' - Resource id #20
-UPDATE usuarios SET mutex='1', tiempo=now() WHERE oid='457' - 1
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #33
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #38
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #40
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #42
-SELECT * FROM opciones - Resource id #44
-SELECT oid FROM usuarios WHERE oid = '457' AND tipo='candidato' - Resource id #46
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #48
-SELECT * FROM usuarios WHERE oid="457" - Resource id #50
-SELECT id as cod, nombre as nombre FROM procedencia_cv ORDER BY nombre - Resource id #84
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #92
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #94
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #96
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #98
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #100
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #102
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #104
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #106
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #108
-SELECT idioma, id FROM idioma_usuario, idiomas WHERE oid_i = '457' and idioma_usuario.idioma = idiomas.oid - Resource id #110
-SELECT idioma, id FROM idioma_usuario, idiomas WHERE oid_i = '457' and idioma_usuario.idioma = idiomas.oid - Resource id #112
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #114
-SELECT t.oid, t.id FROM titulacion_usuario tu, titulaciones t WHERE tu.oid_i = '457' and tu.titulacion = t.oid - Resource id #116
-SELECT t.oid, t.id FROM titulacion_usuario tu, titulaciones t WHERE tu.oid_i = '457' and tu.titulacion = t.oid - Resource id #118
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #120
-SELECT * FROM historial_usuario WHERE oid_h='457' ORDER BY fecha_h DESC - Resource id #123
-select mutex,tiempo from usuarios where oid = '457' - Resource id #20
-UPDATE usuarios SET mutex='1', tiempo=now() WHERE oid='457' - 1
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #33
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #38
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #40
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #42
-SELECT * FROM opciones - Resource id #44
-SELECT oid FROM usuarios WHERE oid = '457' AND tipo='candidato' - Resource id #46
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #48
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #51
-SELECT * FROM usuarios WHERE oid="457" - Resource id #54
-SELECT id as cod, nombre as nombre FROM procedencia_cv ORDER BY nombre - Resource id #88
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #96
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #98
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #100
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #102
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #104
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #106
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #108
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #110
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #112
-SELECT idioma, id FROM idioma_usuario, idiomas WHERE oid_i = '457' and idioma_usuario.idioma = idiomas.oid - Resource id #114
-SELECT idioma, id FROM idioma_usuario, idiomas WHERE oid_i = '457' and idioma_usuario.idioma = idiomas.oid - Resource id #116
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #118
-SELECT t.oid, t.id FROM titulacion_usuario tu, titulaciones t WHERE tu.oid_i = '457' and tu.titulacion = t.oid - Resource id #120
-SELECT t.oid, t.id FROM titulacion_usuario tu, titulaciones t WHERE tu.oid_i = '457' and tu.titulacion = t.oid - Resource id #122
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #124
-SELECT * FROM historial_usuario WHERE oid_h='457' ORDER BY fecha_h DESC - Resource id #127
-select mutex,tiempo from usuarios where oid = '457' - Resource id #20
-UPDATE usuarios SET mutex='1', tiempo=now() WHERE oid='457' - 1
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #33
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #38
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #40
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #42
-SELECT * FROM opciones - Resource id #44
-SELECT oid FROM usuarios WHERE oid = '457' AND tipo='candidato' - Resource id #46
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #48
-SELECT * FROM usuarios WHERE oid="457" - Resource id #54
-SELECT email FROM usuarios WHERE email='perez@perez.com' AND oid <> '457' - Resource id #56
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #60
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'localidad (de - a S.S. de los Reyes)') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #63
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'incorporacion (de 0 a 1)') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #66
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'fecha_nacimiento (de 0000-00-00 a 2011-01-01)') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #69
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'fecha_entrevista (de 0000-00-00 a -0-0)') - 1
-UPDATE usuarios SET localidad = '31',incorporacion = '1',fecha_nacimiento = '2011-01-01',fecha_entrevista = '-0-0', fecha_modificacion = '2011-04-06' WHERE oid='457' - 1
-DELETE FROM candidato_pedido WHERE candidato='457' AND estado='3' - 1
-DELETE FROM candidato_pedido WHERE candidato='457' AND estado='3' - 1
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #75
-SELECT id FROM provincias WHERE oid='' - Resource id #77
-INSERT INTO provincia_usuario VALUES('', '457') - 
-DELETE FROM candidato_pedido WHERE candidato='457' AND estado='3' - 1
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #81
-SELECT id FROM perfil WHERE oid='4' - Resource id #83
-INSERT INTO perfil_usuario VALUES('4', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #86
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: DBA') - 1
-SELECT id FROM perfil WHERE oid='16' - Resource id #89
-INSERT INTO perfil_usuario VALUES('16', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #92
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: DW, Business Intelligent') - 1
-SELECT id FROM perfil WHERE oid='5' - Resource id #95
-INSERT INTO perfil_usuario VALUES('5', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #98
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: Jefe Proyecto') - 1
-SELECT id FROM perfil WHERE oid='15' - Resource id #101
-INSERT INTO perfil_usuario VALUES('15', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #104
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: Maquetador/Diseño Grafico') - 1
-SELECT id FROM perfil WHERE oid='6' - Resource id #107
-INSERT INTO perfil_usuario VALUES('6', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #110
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: Operador de Consola') - 1
-SELECT id FROM perfil WHERE oid='7' - Resource id #113
-INSERT INTO perfil_usuario VALUES('7', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #116
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: Operador de Sistemas') - 1
-SELECT id FROM perfil WHERE oid='8' - Resource id #119
-INSERT INTO perfil_usuario VALUES('8', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #122
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: Otros') - 1
-SELECT id FROM perfil WHERE oid='9' - Resource id #125
-INSERT INTO perfil_usuario VALUES('9', '457') - 1
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #128
-INSERT INTO historial_usuario (oid_h, fecha_h, persona_h, texto_h) VALUES('457', now(), 'Supervisor', 'Nuevo perfil: Programador Junior') - 1
-DELETE FROM candidato_pedido WHERE candidato='457' AND estado='3' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #132
-SELECT id as cod, nombre as nombre FROM procedencia_cv ORDER BY nombre - Resource id #169
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #177
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #179
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #181
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #183
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #185
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #187
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #189
-SELECT idioma, id FROM idioma_usuario, idiomas WHERE oid_i = '457' and idioma_usuario.idioma = idiomas.oid - Resource id #191
-SELECT idioma, id FROM idioma_usuario, idiomas WHERE oid_i = '457' and idioma_usuario.idioma = idiomas.oid - Resource id #193
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #195
-SELECT t.oid, t.id FROM titulacion_usuario tu, titulaciones t WHERE tu.oid_i = '457' and tu.titulacion = t.oid - Resource id #197
-SELECT t.oid, t.id FROM titulacion_usuario tu, titulaciones t WHERE tu.oid_i = '457' and tu.titulacion = t.oid - Resource id #199
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #201
-SELECT * FROM historial_usuario WHERE oid_h='457' ORDER BY fecha_h DESC - Resource id #204
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT oid as cod, id as nombre FROM provincias ORDER BY nombre - Resource id #75
-SELECT oid as cod, id as nombre FROM perfil ORDER BY nombre - Resource id #83
-SELECT oid as cod, id as nombre FROM tecnologia ORDER BY nombre - Resource id #85
-SELECT oid as cod, id as nombre FROM idiomas ORDER BY nombre - Resource id #87
-SELECT oid as cod, id as nombre FROM titulaciones ORDER BY nombre - Resource id #89
-UPDATE partes_actividad SET mutex='0' WHERE mutex='1' - 1
-UPDATE pedidos SET mutex='0' WHERE mutex='1' - 1
-UPDATE usuarios SET mutex='0' WHERE mutex='1' - 1
-UPDATE vacaciones SET mutex='0' WHERE mutex='1' - 1
-SELECT id, padres FROM rol WHERE oid = '3' - Resource id #37
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #39
-SELECT id, padres FROM rol WHERE oid = '6' - Resource id #41
-SELECT * FROM opciones - Resource id #43
-SELECT id, padres FROM rol WHERE oid = '4' - Resource id #58
-select usuarios.* from usuarios where usuarios.tipo = 'candidato' and usuarios.nombre like '%nombre%' and usuarios.procedencia = '1'  - Resource id #60
-SELECT oid FROM usuarios WHERE oid = '457' AND tipo='candidato' - Resource id #62
-SELECT oid FROM usuarios WHERE oid = '457' - Resource id #64
-SELECT * FROM usuarios WHERE oid="457" - Resource id #70
-SELECT p.oid, p.id FROM perfil_usuario pu, perfil p WHERE pu.oid_i = '457' and pu.perfil = p.oid - Resource id #75
-SELECT tecnologia, id FROM tecnologia_usuario, tecnologia WHERE oid_i = '457' and tecnologia_usuario.tecnologia = tecnologia.oid - Resource id #77
-SELECT l.oid, l.id FROM provincia_usuario lu, provincias l WHERE lu.oid_i = '457' and lu.provincia = l.oid - Resource id #79

src/Objects/Candidato.php

@@ -12,6 +12,66 @@ include_once("BD.php");
 include_once("Persona.php");
 include_once("Automata.php");
 include_once("ListaCapacidadesProfesionales.php");
+include_once("upload.class.php");
+
+function limpia($imagen){
+		if(file_exists($imagen)) {
+			unlink($imagen);
+		}
+}
+
+function tieneImagen($OID){
+	$cadena = 'imagenes/' . $OID . '_150.jpg';
+	return file_exists($cadena);
+}
+
+function rutaImagen($OID){
+	$cadena = 'imagenes/' . $OID . '_150.jpg';
+	return $cadena;
+}
+
+function uploadImagenCandidato($OID, $size1_w, $size1_h, $size2_w=0, $size2_h=0, $mascara='') {
+		$path = "imagenes/";											// este directorio tiene que tener chmod 777
+		$upload_file_name = "candidato_imagen";									// el nombre del campo tipo file de nuestro formulario
+		$acceptable_file_types = "image/gif|image/jpeg|image/pjpeg";	// acepta GIF et JPEG
+		$default_extension = "";
+		$mode = 1;		// OPTIONS:
+						//	   1 = overwrite mode
+						//	   2 = create new with incremental extention
+						//	   3 = do nothing if exists, highest protection
+
+// un poco de limpieza previa
+	// este es el temporal
+		$glob = glob($path . $OID, '_tmp');
+		limpia($glob);
+		limpia($path . '_' . $size1_w . '.jpg');
+		limpia($path . '_' . $size2_w . '.jpg');
+// fin de la limpia
+
+		if(strlen($_FILES['candidato_imagen']['name'])) {
+			$my_uploader = new uploader('es');			// Create a new instance of the class
+			$my_uploader->max_filesize(1500000);			// OPTIONAL: set the max filesize of uploadable files in bytes
+			$my_uploader->max_image_size(1600, 1600);	// OPTIONAL: if you're uploading images, you can set the max pixel dimensions			
+				// UPLOAD the file
+			if ($my_uploader->upload($upload_file_name, $acceptable_file_types, $default_extension)) {
+				$my_uploader->save_file($path, $OID . '_tmp', $mode);
+				if (!$my_uploader->error) {
+					$my_uploader->resize($OID . '_' . $size1_w . '.jpg', $size1_w, $size1_h, 60);
+					if($size2_w) {
+						$my_uploader->resize($OID . '_' . $size2_w . '.jpg', $size2_w, $size2_h, 60);
+					}
+					$my_uploader->delete_file;
+				}
+			}
+			if ($my_uploader->error) {
+				echo $my_uploader->error;
+			}
+			
+			$glob = glob($path . $OID, '_tmp');
+			limpia($glob);
+		}
+}
+
 
 class Candidato extends Persona {
 
@@ -87,7 +147,7 @@ return $resultado;
         return $bd->getCampo($consulta);
     }
 
-    function addCurriculum($fichero) {
+    function addCurriculum($fichero, $tipo) {
         //PERMISOS:
         /*
          * Admin (1) - Todos
@@ -96,7 +156,7 @@ return $resultado;
          */
         $sesion = $this->usuario->getValor("oid");
         if ($this->usuario->tieneRol(3) || $this->usuario->tieneRol(1) || $this->usuario->tieneRol(4)) {
-            return parent::addCurriculum($fichero, $this->usuario->getValor("nombre"));
+            return parent::addCurriculum($fichero, $tipo, $this->usuario->getValor("nombre"));
         } else {
             $error = "El usuario no tiene permisos para asociar CV al candidato.";
             throw new Exception($error);
@@ -113,8 +173,6 @@ return $resultado;
          * Otro - Excepción
          */
         $sesion = $this->usuario->getValor("oid");
-        echo $this->usuario->tieneRol(1);
-        echo $this->usuario->tieneRol(4);
         if ($this->usuario->tieneRol(1) || $this->usuario->tieneRol(4)) {
             parent::removeCurriculum($curriculum, $fecha, $this->usuario->getValor("nombre"));
         } else {
@@ -155,8 +213,8 @@ return $resultado;
          * Otro - Excepción
          */
         $sesion = $this->usuario->getValor("oid");
-        //Nos declaramos un array de estados eliminables:
+        //Nos declaramos un array de estados eliminables: se cambia a los nuevos estados #723 Peticion
-        $estados_eliminables = array("510","521","522","523","540");
+        $estados_eliminables = array("510","511","520","600");
         if ($this->usuario->tieneRol(1) || $this->usuario->tieneRol(4)) {
             $estado = $this->getValor("estado");
             if (in_array($estado, $estados_eliminables)) {

src/Objects/Empleado.php

@@ -73,7 +73,7 @@
 		}
  	}
 
- 	function addCurriculum($fichero){
+ 	function addCurriculum($fichero, $tipo){
 		//PERMISOS:
 		/*
 		 * Admin (1) - Todos
@@ -82,7 +82,7 @@
 		 */
 		$sesion = $this->usuario->getValor("oid");
 		if($this->usuario->tieneRol(3) || $this->usuario->tieneRol(1) || $this->usuario->tieneRol(4)){
- 			return parent::addCurriculum($fichero, $this->usuario->getValor("nombre"));
+ 			return parent::addCurriculum($fichero, $tipo, $this->usuario->getValor("nombre"));
  		}else{
 			$error = "El usuario no tiene permisos para asociar CV al empleado.";
     		throw new Exception($error);

src/Objects/HTML.php

@@ -66,7 +66,8 @@
 		if($usuario->tieneRol("3") ||$usuario->tieneRol("1")){
 			echo '<a href="addPedido.php" class="menuOption" style="color:#000000">'.$this->locale['1008'].'</a>';
 		}
-			echo '<a href="buscar_pedido.php" class="menuOption" style="color:#000000">'.$this->locale['1009'].'</a>';
+		
+		//echo '<a href="buscar_pedido.php" class="menuOption" style="color:#000000">'.$this->locale['1009'].'</a>';
 		// Buscar candidatos
 		/*if(substr_count($_SERVER['REQUEST_URI'],"/pedido.php?idPedido")==1){
 			echo '<a href="buscar.php" class="menuOption" target="_blank" style="color:#000000">'.$this->locale['820'].'</a>';
@@ -93,10 +94,20 @@
  		} else {
  			$opcionesThis = $opciones;
  		}
- 		echo '<a href="lista_ofertas.php" class="menuOption" style="color:#000000">'.$this->locale['5100'].'</a>';
+
- 		if($usuario->tieneRol("3") ||$usuario->tieneRol("1")){
+		echo '<a href="lista_ofertas.php" class="menuOption" style="color:#000000">'.$this->locale['5100'].'</a>';
- 			echo '<a href="addOferta.php" class="menuOption" style="color:#000000">'.$this->locale['5101'].'</a>';
+
- 		}
+		if((!$usuario->tieneRol("7")) && (substr_count($_SERVER['REQUEST_URI'],"/oferta.php?idOferta")==1)){
+         	echo '<a href="gestion_oferta.php?idOferta='.$_GET['idOferta'].'" class="menuOption" style="color:#000000">'.$this->locale['ed'].'</a>'; 		
+        }
+         	
+		if(substr_count($_SERVER['REQUEST_URI'],"/gestion_oferta.php?idOferta")==1){
+         	echo '<a href="oferta.php?idOferta='.$_GET['idOferta'].'" class="menuOption" style="color:#000000">'.$this->locale['im'].'</a>'; 		
+        }
+         	
+// 		if($usuario->tieneRol("3") ||$usuario->tieneRol("1")){
+// 			echo '<a href="addOferta.php" class="menuOption" style="color:#000000">'.$this->locale['5101'].'</a>';
+// 		}
  		/*echo '<a href="buscar_oferta.php" class="menuOption" style="color:#000000">'.$this->locale['5102'].'</a>';*/
 /*
  		if(!in_array("gestionar", $opcionesThis)){

src/Objects/ListaCandidatos.php

@@ -46,12 +46,22 @@ class ListaCandidatos extends ListaPersonas {
         return $bd->keyValueQuery($consulta, "cod", "nombre");
     }
 
+    /**
+     * Devuelve una lista de los campos por los que buscar del candidato.
+     */
+    function getCamposBusqueda() {
+        $consulta = "SHOW FIELDS FROM usuarios";
+        $bd = new BD();
+        $resultado = $bd->execQuery($consulta);
+        return $resultado;
+    }
+
     /**
      * Inserta un nuevo candidato en la lista de candidatos.
      * @param campos - datos del candidato.
      */
     function addCandidato($campos) {
-        $campos["estado"] = 510; //Pendiente de clasificar
+        $campos["estado"] = 510; //Borrador se cambia a los nuevos estados #723 Peticion
         $id = parent::addPersona($campos);
         $candidato = new Candidato($this->usuario, $id);
         $mensaje = "Nuevo candidato"; 

src/Objects/ListaOfertas.php

@@ -41,7 +41,14 @@ class ListaOfertas {
     function getOfertas() {
         // sacado de http://patrickallaert.blogspot.com/2007/09/building-dynamic-sql-queries-elegant.html
         
-        $consulta = "SELECT * FROM candidato_pedido";
+//        $consulta = "SELECT * FROM candidato_pedido";
+        $consulta = "SELECT 
+candidato_pedido.`oid`, candidato_pedido.`referencia`, candidato_pedido.`candidato`, CONCAT(usuarios.nombre, ' ', usuarios.apellidos) as nombre_candidato, candidato_pedido.`pedido`, pedidos.nombre as nombre_solicitud,
+candidato_pedido.`afinidad`, candidato_pedido.`estado`, candidato_pedido.`RRHH`, candidato_pedido.`fecha`, 
+candidato_pedido.`obsGerente`, candidato_pedido.`obsRRHH`, candidato_pedido.`gerente`, candidato_pedido.`salario_ofertado`
+FROM candidato_pedido
+LEFT JOIN usuarios on usuarios.oid = candidato_pedido.candidato
+LEFT JOIN pedidos on pedidos.oid = candidato_pedido.pedido";
            
         if (count($this->condiciones)) {
             $consulta .= ' WHERE ' . implode(' AND ', $this->condiciones);
@@ -53,6 +60,7 @@ class ListaOfertas {
 
         $bd = new BD();
         $resultado = $bd->execQuery($consulta);
+//echo $consulta;
         // Procesamos las ofertas.
         if (mysql_num_rows($resultado) == 0) {
             $this->ofertas = array();

src/Objects/ListaPedido.php

@@ -72,7 +72,7 @@ include_once("Objects/Pedido.php");
 		$estado = $this->tipo;
 		if($this->pedidos == null){
 			//Modificamos la consulta en función del rol.
-			if($this->gestor->tieneRol(4) || $this->gestor->tieneRol(1)){
+			if($this->gestor->tieneRol(4) || $this->gestor->tieneRol(1) || $this->gestor->tieneRol(7)){
 				if($this->sql != ""){
 					// metemos el tipo si es >0
 					if($estado > 0){
@@ -94,9 +94,23 @@ include_once("Objects/Pedido.php");
 					$consulta = $sqlNueva." ".$this->order_by;
 				}else{
 					if($estado > 0){
-						$consulta = "SELECT * from pedidos WHERE estado='".$estado."'".$this->orden ;
+						$consulta = "SELECT * from pedidos WHERE estado='".$estado."'";
+
+						//En el caso de ser un usuario de cliente para ver sus pedidos filtramos por cliente
+						if (($this->gestor->tieneRol(7)) && ($this->gestor->getValor("cliente_actual")>0)){
+							$consulta .= " and cliente = ". $this->gestor->getValor("cliente_actual") . " ";
+						}
+
+						$consulta .= $this->orden;
 					}else{
-						$consulta = "SELECT * from pedidos ".$this->orden."";
+						$consulta = "SELECT * from pedidos ";
+
+						//En el caso de ser un usuario de cliente para ver sus pedidos filtramos por cliente
+						if (($this->gestor->tieneRol(7)) && ($this->gestor->getValor("cliente_actual")>0)){
+							$consulta .= " where cliente = ". $this->gestor->getValor("cliente_actual") . " ";
+						}
+						
+						$consulta .= $this->orden;
 					}
 				}
 			}else if($this->gestor->tieneRol(3)){
@@ -132,6 +146,7 @@ include_once("Objects/Pedido.php");
 			}
 
 			$bd=new BD();
+
 			$resultado = $bd->execQuery($consulta);
 			//Procesamos los pedidos.
 			if(mysql_num_rows($resultado) == 0){

src/Objects/ListaPersonas.php

@@ -94,8 +94,8 @@ include_once("Empleado.php");
 				}else{
 					if($estado > 0){
 						$consulta = "SELECT * from usuarios where tipo = '".$this->tipo."' and estado='".$estado."' ".$this->orden;
-					} else{
+					} else{ //se cambia a los nuevos estados #723 Peticion
-						$consulta = "SELECT * from usuarios where tipo = '".$this->tipo."' and estado in ('510', '520', '521', '522', '523','530', '540', '550', '560')$this->orden";
+						$consulta = "SELECT * from usuarios where tipo = '".$this->tipo."' and estado in ('510', '511', '520', '530', '540', '560', '600')$this->orden";
 					}
 				}
 
@@ -105,6 +105,7 @@ include_once("Empleado.php");
 			}
 			$bd=new BD();
 			$resultado = $bd->execQuery($consulta);
+			
 			//Procesamos los candidatos.
 			if(mysql_num_rows($resultado) == 0){
 				$this->personas = array();

src/Objects/Oferta.php

@@ -30,26 +30,32 @@ class Oferta {
         }
     }
 
+	function esEliminable() {
+		return ($oferta->getValor("estado") == 100);
+	}
+	
     function eliminar() {
-		//Antes de nada quitamos el candidato asociado a la oferta para que se haga la lógica que corresponda
+		return false;
-        $idCand = $this->getValor("candidato");
+		if ($this->esEliminable()) {
-        if (!empty($idCand)) {
+			//Antes de nada quitamos el candidato asociado a la oferta para que se haga la lógica que corresponda
-            if (!$this->quitarCandidato()) {
+			$idCand = $this->getValor("candidato");
-                return false;                
+			if (!empty($idCand)) {
-            }
+				if (!$this->quitarCandidato()) {
-        }
+					return false;                
+				}
+			}
 
-        // eliminamos en la oferta de la BD
+			// eliminamos en la oferta de la BD
-        $consulta = "DELETE FROM candidato_pedido WHERE oid = ".$this->campos['oid'];
+			$consulta = "DELETE FROM candidato_pedido WHERE oid = ".$this->campos['oid'];
-
+			$bd = new BD();
-        $bd = new BD();
+			if (!$bd->execQuery($consulta)) {
-        if (!$bd->execQuery($consulta)) {
+				return false;
-            return false;
+			} else {
-        } else {
+				$mensaje = "Oferta eliminada";
-            $mensaje = "Oferta eliminada";
+				$this->actualizarHistorial($mensaje);
-            $this->actualizarHistorial($mensaje);
+				return true;                
-            return true;                
+			}
-        }
+		}
 	}    
 
     function actualizarHistorial($mensaje) {
@@ -72,6 +78,10 @@ class Oferta {
             return $this->campos[$nombre];
         } else {
             switch ($nombre) {
+                case "nombre_gerente":$idGerente = $this->getValor("gerente");
+                    $consulta = "SELECT CONCAT(nombre,\" \",apellidos) FROM usuarios WHERE oid=\"" . $idGerente . "\"";
+                    break;
+				
                 case "nombre_estado":
                     $idEstado = $this->getValor("estado");
                     $idioma = $this->usuario->getValor("idioma");
@@ -154,9 +164,9 @@ class Oferta {
     }
 
     /**
-     * En configuración -> Configurada
+     * En proceso -> presentada
      */
-    private function ejecutar110120() {
+    private function ejecutar100120() {
         // Comprobamos que haya un candidato asignado.
         $candidato = $this->getValor("candidato");
         if (!empty($candidato)) {
@@ -169,6 +179,7 @@ class Oferta {
         }
     }
 
+  
     function setCampo($nombre, $valor) {
         // PERMISOS:
         /*
@@ -176,9 +187,9 @@ class Oferta {
          * Gestor (3) - Los suyos
          * Otro - Excepción
          */
+
         $gerente = $this->getValor("gerente");
         $sesion = $this->usuario->getValor("oid");
-
         if ($this->usuario->tieneRol(1) || ($this->usuario->tieneRol(3) && $sesion == $gerente) || $this->setAutomatico) {
             $viejo = $this->getValor($nombre);
             if ($viejo != $valor) {
@@ -189,7 +200,6 @@ class Oferta {
                 $consulta = "UPDATE candidato_pedido SET $nombre = '$valor' WHERE oid='$oid'";
                 $bd = new BD();
                 if ($bd->execQuery($consulta)) {
-                    
                     // Guardar en el historial
                     $valor = $this->getValorMulti($nombre, $valor);
                     
@@ -201,6 +211,16 @@ if ($nombre == "estado") {
   $estado_nuevo = $this->darNombreEstado($valor, "sp");
   $historial = "Cambio de estado (". $estado_viejo ." a ". $estado_nuevo .")";
   $this->actualizarHistorial($historial);
+  
+//Una vez cambiado de estado la oferta, si el nuevo estado es Rechazado o Retirada, liberamos al candidato
+  if (($valor=='160')||($valor=='170')) {
+  	 $idCand = $this->getValor("candidato");
+	 if (!empty($idCand)) {
+		if (!$this->quitarCandidato()) {
+			return false;                
+		}
+	 } 
+  }
 }
 
                 }
@@ -236,10 +256,10 @@ if ($nombre == "estado") {
     }
 
     /**
-     * Devuelve una lista de candidatos disponibles para una oferta, que son todos menos los no disponibles #679 Peticion
+     * Devuelve una lista de candidatos disponibles para una oferta, se cambia a los nuevos estados #723 Peticion
      */
     function getCandidatosDisponibles() {
-        return $this->getCandidatos("510,521,522,523,540,550,560");
+        return $this->getCandidatos("520,530,540,560,600");
     }
 
     /**
@@ -275,25 +295,30 @@ if ($nombre == "estado") {
         return $resultado;
     }
 
+    function getNumOfertasCandidato($oid) {
+        $consulta = "SELECT * FROM candidato_pedido WHERE candidato='$oid' and estado not in (160,170) ORDER BY fecha DESC";
+        $bd = new BD();
+        $resultado = $bd->execQuery($consulta);
+        return mysql_num_rows($resultado);
+    }
+
     function quitarCandidato() {
         $idCand = $this->getValor("candidato");
+        $this->setCampo("candidato", "");
         if (!empty($idCand)) {
             $candidato = new Candidato($this->usuario, $idCand);                      
             $estadoCand = $candidato->getValor("estado");
-			$numOfertasCandidato = $this->getOfertasCandidato($idCand);
+			$numOfertasCandidato = $this->getNumOfertasCandidato($idCand);
-
             switch ($estadoCand) {
-				//TODO CANDIDATO ASOCIADO A UNA OFERTA (este como este su situación) pasará a disponible si no tiene alguna otra oferta,
+				//TODO CANDIDATO ASOCIADO A UNA OFERTA (este como este su situación) pasará a En proceso:disponible si no tiene alguna otra oferta distinta de Rechazada 160 o Retirada 170,
-				//si tiene alguna otra oferta asociada se deja tal cual esta su situación
+				//el estado del candidato no cambia si está asociado a alguna otra oferta que no sea Rechazada 160 o Retirada 170. se cambia a los nuevos estados #723 Peticion
-				//El estado del candidato no cambia si está asociado a alguna otra oferta, sino pasará a Disponible
+                case 600:;
                 case 560:;
                 case 510:;
-                case 521:;                
+                case 511:;                
-                case 522:;                
+                case 520:;                
-                case 523:;                
                 case 530:;
-                case 540:;
+                case 540:
-                case 550:
 				    //Modificamos historial de candidato
 				    $mensaje = "Se quita en oferta ". $this->getValor("referencia");
   			        $candidato->actualizarHistorial($mensaje);
@@ -302,7 +327,7 @@ if ($nombre == "estado") {
                     $mensaje = "El candidato ".$nombre_candidato." se quita de la oferta";
                     $this->actualizarHistorial($mensaje);
                     //Cambiamos de estado al candidato
-					if (count($numOfertasCandidato) <= 1) {
+					if ($numOfertasCandidato < 1) {
                        $candidato->transita("540", "");
 					}
 					return true;
@@ -325,10 +350,10 @@ if ($nombre == "estado") {
 
         $candidato = new Candidato($this->usuario, $idCandidato);
         $estadoCand = $candidato->getValor("estado");
-		$numOfertasCandidato = $this->getOfertasCandidato($idCand);
+		$numOfertasCandidato = $this->getNumOfertasCandidato($idCand);
 
         switch ($estadoCand) {
-			//Disponible asignado, el estado del candidato no cambia, solo se asigna a la oferta y ya está. 
+			//En proceso:Disponible asignado, el estado del candidato no cambia, solo se asigna a la oferta y ya está. 
             case 560: 
                  $this->setCampo("candidato", $idCandidato); 
 				 //Modificamos historial de candidato
@@ -339,13 +364,13 @@ if ($nombre == "estado") {
  				 $mensaje = "Asignado el candidato ".$nombre_candidato;
                  $this->actualizarHistorial($mensaje);
                  return true;
-                 break;		
+            break;		
                  
-            //Pendiente de clasificar, Rechazados tipo1, tipo2, tipo3, Disponible. Todos los candidatos con alguno de estos estados cambiarán a Disponible asignado (560)
+            //Rechazado, Sin más adelante, En proceso:Disponible, Otras provincias. se cambia a los nuevos estados #723 Peticion 
-            case 510:;
+            //Todos los candidatos con alguno de estos estados cambiarán a En proceso:Disponible asignado (560)
-            case 521:;
+            case 600:;
-            case 522:;
+            case 520:;
-            case 523:;
+            case 530:;            
             case 540:
    				 $this->setCampo("candidato", $idCandidato); 
 				 //Modificamos historial de candidato
@@ -365,25 +390,7 @@ if ($nombre == "estado") {
 				 }
 			break;
 			
-			//Asignado exlusivo sin ofertas asociada se asigna y ya esta
+			//("") 	 
-			case 550: if ($numOfertasCandidato > 0) {
-						$error = "El candidato tiene un estado no permitido ('" . $candidato->getValor("estado") . "')";
-						throw new Exception($error);
-					  } 
-					  else {
-                        $this->setCampo("candidato", $idCandidato); 
-						//Modificamos historial de candidato
-						$mensaje = "Asignado en oferta ". $this->getValor("referencia");
-						$candidato->actualizarHistorial($mensaje);
-						//Modificamos historial de oferta
-						$nombre_candidato = $candidato->getValor("nombre") . " " . $candidato->getValor("apellidos");
-						$mensaje = "Asignado el candidato ".$nombre_candidato;
-						$this->actualizarHistorial($mensaje);
-						return true;
-					  }
-			break;							  
-			
-			//("530") No Disponible	 
             default: 
                  $error = "El candidato tiene un estado no permitido ('" . $candidato->getValor("nombre_estado") . "')";
                  throw new Exception($error);

src/Objects/Pedido.php

@@ -12,6 +12,7 @@ include_once("Objects/Afinidad.php");
 include_once("Objects/Automata.php");
 include_once("Objects/Oferta.php");
 include_once("ListaCapacidadesProfesionales.php");
+include_once("Objects/ListaOfertas.php");
 
 class Pedido {
 
@@ -22,6 +23,7 @@ class Pedido {
     /* Contiene una lista con todos los atributos y su valor */
     private $campos = array();
     private $listaOfertas = null;
+    private $totalOfertas = 0;
 
 
     /* Lista de perfiles */
@@ -273,15 +275,29 @@ if ($nombre == "estado") {
          * Gestor (3) - Los suyos
          * Otro - Excepción
          */
-        $gerente = $this->getValor("gerente");
+
-        $sesion = $this->usuario->getValor("oid");
+		//Recogemos todas las ofertas del pedido para proceder a eliminarlas y dejar su candidato libre
-        if ($this->usuario->tieneRol(1) || ($this->usuario->tieneRol(3) && $sesion == $gerente)) {
+		$cond = array();
-            $oid = $this->getValor("oid");
+		$cond[] = "pedido = '".$this->getValor("oid")."'";
-            $consulta = "DELETE FROM pedidos WHERE oid='$oid'";
+        $orden = array();
-            $bd = new BD();
+        $orden[] = "referencia";
-            return $bd->execQuery($consulta);
+        $listaOfertas = new ListaOfertas($this->usuario, $cond, $orden);
-        } else {
+        $ofertas = $listaOfertas->getOfertas();
-            return false;
+		$totalOfertas = count($ofertas);
+        for ($i = 0; $i < $totalOfertas; $i++) 
+            $ofertas[$i]->eliminar();
+
+		if (count($listaOfertas->getOfertas()) == 0) {
+			$gerente = $this->getValor("gerente");
+			$sesion = $this->usuario->getValor("oid");
+			if ($this->usuario->tieneRol(1) || ($this->usuario->tieneRol(3) && $sesion == $gerente)) {
+				$oid = $this->getValor("oid");
+				$consulta = "DELETE FROM pedidos WHERE oid='$oid'";
+				$bd = new BD();
+				return $bd->execQuery($consulta);
+			} else {
+				return false;
+			}
         }
     }
 
@@ -899,7 +915,7 @@ if ($nombre == "estado") {
         $pesoPerfil = $this->getValor("pesoPerfil");
         // Eliminamos a los usuario de la tabla de candidatos en pedido que se encuentren
         // en proceso para este pedido.
-        $consulta = "DELETE FROM candidato_pedido WHERE pedido='$id' AND estado='110'";
+        $consulta = "DELETE FROM candidato_pedido WHERE pedido='$id' AND estado='100'";
         $bd = new BD();
         $bd->execQuery($consulta);
         // Si el pedido no está cerrado calculamos su afinidad para los usuarios:
@@ -929,7 +945,7 @@ if ($nombre == "estado") {
                     $afi = $afinidad->calculaAfinidad($pesoIdioma, $pesoPerfil, $pesoTecno);
                     echo $afi . "<br/>";
                     if ($afi > 0) {
-                        $consulta = "INSERT INTO candidato_pedido (candidato, pedido, afinidad, estado, fecha) VALUES('$idUsuario', '$id', '$afi', '110', curdate())";
+                        $consulta = "INSERT INTO candidato_pedido (candidato, pedido, afinidad, estado, fecha) VALUES('$idUsuario', '$id', '$afi', '100', curdate())";
                         
                         $bd = new BD();
                         $bd->execQuery($consulta);
@@ -1125,6 +1141,18 @@ if ($nombre == "estado") {
         return $resultado;
 	}
 	
+	function getListaOfertas() {
+		//Recogemos todas las ofertas del pedido para proceder a eliminarlas y dejar su candidato libre
+		$cond = array();
+		$cond[] = "pedido = '".$this->getValor("oid")."'";
+        $orden = array();
+        $orden[] = "referencia";
+        $Ofertas = new ListaOfertas($this->usuario, $cond, $orden);
+        $listaOfertas = $Ofertas->getOfertas();
+		$totalOfertas = count($ofertas);
+		return $listaOfertas;
+	}
+
 }
 
 ?>

src/Objects/Persona.php

@@ -10,6 +10,7 @@
  include_once("BD.php");
  include_once("Rol.php");
  include_once("Objects/Administracion.php");
+ include_once("functions_solr.php");
 
  class Persona{
 
@@ -691,11 +692,12 @@
 	/**
 	 * A<EFBFBD>ade un nuevo curr<EFBFBD>culum a la persona.
 	 */
-	protected function addCurriculum($archivo, $usuario){
+	protected function addCurriculum($archivo, $tipo, $usuario){
 		$cv = $this->getValor("cv") + 1;
 		$oid = $this->getValor("oid");
 
 		$nombre_archivo = $oid."-".$cv;
+		$tipo_curriculum = $tipo;
 
 		$directorio = constante("srcDocs").SLASH."cv".SLASH;
 		if (!@file_exists($directorio)){
@@ -715,13 +717,15 @@
 		$nombre_ruta_tabla=addslashes($nombre_ruta_tabla);
 
 		if($fichero_subido){
-				$bd = new BD();
+                        $bd = new BD();
-				$consulta = "INSERT INTO curriculum_usuario (oid, curriculum, fecha) values ('".$oid."', '".$nombre_ruta_tabla."', now())";
+                        $consulta = "INSERT INTO curriculum_usuario (oid, curriculum, fecha, tipo_curriculum) values ('".$oid."', '".$nombre_ruta_tabla."', now(), ".$tipo_curriculum.")";
-				$bd->execQuery($consulta);
+                        $bd->execQuery($consulta);
 		        //$this->actualizarHistorial("Nuevo CV", $usuario);
-				$consulta = "update usuarios set cv=cv+1 where oid='$oid'";
+                        $consulta = "update usuarios set cv=cv+1 where oid='$oid'";
-				$bd->execQuery($consulta);
+                        $bd->execQuery($consulta);
-				return true;
+                        
+                        solr_anadir_cv($oid, $destino);
+                        return true;
 		}
 
 		return false;
@@ -732,21 +736,20 @@
 		$consulta = "DELETE FROM curriculum_usuario WHERE oid = '".$oid."' and curriculum = '".$curriculum."' and fecha = '".$fecha."'";
 		$bd = new BD();
 		$resultado = $bd->execQuery($consulta);
-
+                if ($resultado){                    
-        if ($resultado){
         		$consulta = "update usuarios set cv=cv-1 where oid='$oid'";
-                $bd->execQuery($consulta);
+                        $bd->execQuery($consulta);
-
+                        $cambios = "CV eliminado";
-                $cambios = "CV eliminado";
+                        //$this->actualizarHistorial($cambios, $usuario);
-
-				//$this->actualizarHistorial($cambios, $usuario);
-				$ruta = constante("srcDocs")."\\".$curriculum;
-                if (!@unlink($ruta)){
-                        return false;
-                }else{
-                	return true;
-                }
                         
+                        $ruta = constante("srcDocs")."\\".$curriculum;
+                        if (is_file($ruta) && unlink($ruta))
+                        {
+                            solr_eliminar_cv($ruta);
+                            return true;
+                        } else {
+                            return false;
+                        }
 		}
 
 		return false;

src/Objects/Usuario.php

@@ -19,7 +19,7 @@
  	}
 
 	public function getRutaCV($id){
-		if($this->tieneRol(4) || $this->tieneRol(3)){
+		if($this->tieneRol(4) || $this->tieneRol(3) || $this->tieneRol(7)){
 			$consulta = "SELECT curriculum FROM curriculum_usuario WHERE cod = '".$id."'";
 			$bd = new BD();
 			$ruta = $bd->getCampo($consulta);
@@ -41,7 +41,7 @@
 	}
 
 	public function getNombreCV($id){
-		if($this->tieneRol(4) || $this->tieneRol(3)){
+		if($this->tieneRol(4) || $this->tieneRol(3) || $this->tieneRol(7)){
 			$ruta = $this->getRutaCV($id);
 			$consulta="SELECT CONCAT(nombre,\" \",apellidos,\" (\",fecha,\")\") FROM usuarios, curriculum_usuario WHERE curriculum_usuario.cod=\"".$id."\" AND curriculum_usuario.oid = usuarios.oid";
 			$bd = new BD();

src/Objects/upload.class.php

@@ -0,0 +1,678 @@
+<?php
+/**
+ * 
+ * class uploader
+ * 
+ * Copyright 1999, 2002, 2003 David Fox, Dave Tufts
+ * Language specific error messaging:
+ * 		[fr] Frank from http://www.ibigin.com - initial code and French text
+ * 		[de] lmg from http://www.kishalmi.net - German text
+ * 		[nl] Andre, a.t.somers@student.utwente.nl - Dutch text
+ * 		[it] Enrico Valsecchi http://www.hostyle.it <admin@hostyle.it> - Italian text
+ * 		[fi] Dotcom Media Solutions, http://www.dotcom.ms - Finnish text
+ * 		[es] Alejandro Ramirez <alex@cinenganos.com> - Spanish text
+ * 		[no] Sigbjorn Eide <seide@tiscali.no> - Norwegian text
+ * 		[da] Thomas Hannibal http://hannibalsoftware.dk/ - Danish Text
+ * 
+ * Usage, setup, and license at the bottom of this page (README)
+ * 
+ * @version:      2.15
+ * @last_update:  2004-02-18
+ * @description:  PHP file upload class
+ * @requires:	  PHP 4.1 or higher
+ * 
+ * @changes:      v2.15  - Added Danish (da) error messaging
+ * @changes:      v2.14  - Edited acceptable_file_types checks to be more lenient
+ * @changes:      v2.13  - Added Spanish (es) and Norwegian (no) error messaging, converted all non-valid HTML language chars to named entities
+ * @changes:      v2.12  - Added Finnish (fi) error messaging
+ * @changes:      v2.11  - Fixed bug if $this->save_file::$path is ""
+ * @changes:      v2.10  - Added var $path to class definition
+ * @changes:      v2.9   - Updated error_message[5] for NL (Dutch)
+ * @changes:      v2.8   - Cleaned up Italian error messaging (thanks to Maurizio Lemmo - http://www.tenzione.it/ )
+ * @changes:      v2.7   - Added new error code [5] to save_file() method, fixed minor bug if unable to write to upload directory
+ * @changes:      v2.6   - Added $this->acceptable_file_types. Fixed minor bug fix in upload() - if file 'type' is null
+ * @changes:      v2.5.2 - Added Italian (it) error messgaing
+ * @changes:      v2.5.1 - Added German (de) and Dutch (nl) error messgaing
+ * @changes:      v2.4   - Added error messgae language preferences
+ * @changes:      v2.3.1 - Bugfix for upload $path in $this->save_file()
+ * @changes:      v2.3   - Initialized all variables (compatibale with PHP error notices)
+ * @changes:      v2.2   - Changed ereg() to stristr() whenever possible
+ * 
+ * 
+ *	METHODS:
+ *		uploader()	 		- constructor, sets error message language preference
+ *		max_filesize() 		- set a max filesize in bytes
+ *		max_image_size() 	- set max pixel dimenstions for image uploads
+ *		upload() 			- checks if file is acceptable, uploads file to server's temp directory
+ *		save_file() 		- moves the uploaded file and renames it depending on the save_file($overwrite_mode)
+ *	
+ *		cleanup_text_file()	- (PRIVATE) convert Mac and/or PC line breaks to UNIX
+ *		get_error() 		- (PRIVATE) gets language-specific error message
+ * 
+ *	Error code: available in English (en), French (fr), German (de), Dutch (nl), Italian (it)
+ *		[0] - "No file was uploaded"
+ *		[1] - "Maximum file size exceeded"
+ *		[2] - "Maximum image size exceeded"
+ *		[3] - "Only specified file type may be uploaded"
+ *		[4] - "File already exists" (save only)
+ *		[5] - "Permission denied. Unable to copy file"
+ *
+ */
+ 
+ 
+ function htmlpath($relative_path) {
+   $realpath=realpath($relative_path);
+   $htmlpath=str_replace($_SERVER['DOCUMENT_ROOT'], '', $realpath);
+   return $htmlpath;
+}
+
+class uploader {
+
+	var $file;
+	var $path;
+	var $language;
+	var $acceptable_file_types;
+	var $error;
+	var $errors; // Depreciated (only for backward compatability)
+	var $accepted;
+	var $max_filesize;
+	var $max_image_width;
+	var $max_image_height;
+
+
+	/**
+	 * object uploader ([string language]);
+	 * 
+	 * Class constructor, sets error messaging language preference
+	 * 
+	 * @param language		(string) defaults to en (English).
+	 * 
+	 * @examples:	$f = new uploader(); 		// English error messages
+	 *				$f = new uploader('fr');	// French error messages
+	 *				$f = new uploader('de');	// German error messages
+	 *				$f = new uploader('nl');	// Dutch error messages
+	 *				$f = new uploader('it');	// Italian error messages
+	 *				$f = new uploader('fi');	// Finnish error messages
+	 *				$f = new uploader('es');	// Spanish error messages
+	 *				$f = new uploader('no');	// Norwegian error messages
+	 *				$f = new uploader('da');	// Danish error messages
+	 * 
+	 */
+	function uploader ( $language = 'en' ) {
+		$this->language = strtolower($language);
+		$this->error   = '';
+	}
+	
+	
+	/**
+	 * void max_filesize ( int size);
+	 * 
+	 * Set the maximum file size in bytes ($size), allowable by the object.
+	 * NOTE: PHP's configuration file also can control the maximum upload size, which is set to 2 or 4 
+	 * megs by default. To upload larger files, you'll have to change the php.ini file first.
+	 * 
+	 * @param size 			(int) file size in bytes
+	 * 
+	 */
+	function max_filesize($size){
+		$this->max_filesize = (int) $size;
+	}
+
+
+	/**
+	 * void max_image_size ( int width, int height );
+	 * 
+	 * Sets the maximum pixel dimensions. Will only be checked if the 
+	 * uploaded file is an image
+	 * 
+	 * @param width			(int) maximum pixel width of image uploads
+	 * @param height		(int) maximum pixel height of image uploads
+	 * 
+	 */
+	function max_image_size($width, $height){
+		$this->max_image_width  = (int) $width;
+		$this->max_image_height = (int) $height;
+	}
+	
+	
+	/**
+	 * bool upload (string filename[, string accept_type[, string extension]]);
+	 * 
+	 * Checks if the file is acceptable and uploads it to PHP's default upload diretory
+	 * 
+	 * @param filename		(string) form field name of uploaded file
+	 * @param accept_type	(string) acceptable mime-types
+	 * @param extension		(string) default filename extenstion
+	 * 
+	 */
+	function upload($filename='', $accept_type='', $extention='') {
+		
+		$this->acceptable_file_types = trim($accept_type); // used by error messages
+
+		if (!isset($_FILES) || !is_array($_FILES[$filename]) || !$_FILES[$filename]['name']) {
+			$this->error = $this->get_error(0);
+			$this->accepted  = FALSE;
+			return FALSE;
+		}
+
+		// Copy PHP's global $_FILES array to a local array
+		$this->file = $_FILES[$filename];
+		$this->file['file'] = $filename;
+
+		// Initialize empty array elements
+		if (!isset($this->file['extention'])) $this->file['extention'] = "";
+		if (!isset($this->file['type']))      $this->file['type']      = "";
+		if (!isset($this->file['size']))      $this->file['size']      = "";
+		if (!isset($this->file['width']))     $this->file['width']     = "";
+		if (!isset($this->file['height']))    $this->file['height']    = "";
+		if (!isset($this->file['tmp_name']))  $this->file['tmp_name']  = "";
+		if (!isset($this->file['raw_name']))  $this->file['raw_name']  = "";
+
+		// test max size
+		if($this->max_filesize && ($this->file["size"] > $this->max_filesize)) {
+			$this->error = $this->get_error(1);
+			$this->accepted  = FALSE;
+			return FALSE;
+		}
+
+		if(stristr($this->file["type"], "image")) {
+			/* IMAGES */
+			$image = getimagesize($this->file["tmp_name"]);
+			$this->file["width"]  = $image[0];
+			$this->file["height"] = $image[1];
+			
+			// test max image size
+			if(($this->max_image_width || $this->max_image_height) && (($this->file["width"] > $this->max_image_width) || ($this->file["height"] > $this->max_image_height))) {
+				$this->error = $this->get_error(2);
+				$this->accepted  = FALSE;
+				return FALSE;
+			}
+			// Image Type is returned from getimagesize() function
+			switch($image[2]) {
+				case 1:
+					$this->file["extention"] = ".gif"; break;
+				case 2:
+					$this->file["extention"] = ".jpg"; break;
+				case 3:
+					$this->file["extention"] = ".png"; break;
+				case 4:
+					$this->file["extention"] = ".swf"; break;
+				case 5:
+					$this->file["extention"] = ".psd"; break;
+				case 6:
+					$this->file["extention"] = ".bmp"; break;
+				case 7:
+					$this->file["extention"] = ".tif"; break;
+				case 8:
+					$this->file["extention"] = ".tif"; break;
+				default:
+					$this->file["extention"] = $extention; break;
+			}
+		} elseif(!ereg("(\.)([a-z0-9]{3,5})$", $this->file["name"]) && !$extention) {
+			// Try and autmatically figure out the file type
+			// For more on mime-types: http://httpd.apache.org/docs/mod/mod_mime_magic.html
+			switch($this->file["type"]) {
+				case "text/plain":
+					$this->file["extention"] = ".txt"; break;
+				case "text/richtext":
+					$this->file["extention"] = ".txt"; break;
+				default:
+					break;
+			}
+		} else {
+			$this->file["extention"] = $extention;
+		}
+
+		// check to see if the file is of type specified
+		if($this->acceptable_file_types) {
+			if(trim($this->file["type"]) && (stristr($this->acceptable_file_types, $this->file["type"]) || stristr($this->file["type"], $this->acceptable_file_types)) ) {
+				$this->accepted = TRUE;
+			} else { 
+				$this->accepted = FALSE;
+				$this->error = $this->get_error(3);
+			}
+		} else { 
+			$this->accepted = TRUE;
+		}
+
+		return (bool) $this->accepted;
+	}
+
+
+	/**
+	 * bool save_file ( string path[, int overwrite_mode] );
+	 * 
+	 * Cleans up the filename, copies the file from PHP's temp location to $path, 
+	 * and checks the overwrite_mode
+	 * 
+	 * @param path				(string) File path to your upload directory
+	 * @param overwrite_mode	(int) 	1 = overwrite existing file
+	 * 									2 = rename if filename already exists (file.txt becomes file_copy0.txt)
+	 * 									3 = do nothing if a file exists
+	 * 
+	 */
+	function save_file($path, $nu_name="", $overwrite_mode="3"){
+		if ($this->error) {
+			return false;
+		}
+		
+		if (strlen($path)>0) {
+			if ($path[strlen($path)-1] != "/") {
+				$path = $path . "/";
+			}
+		}
+		$this->path = $path;	
+		$copy       = "";	
+		$n          = 1;	
+		$success    = false;	
+				
+		if($this->accepted) {
+		// ff 220704 cambio el nombre por el nuevo
+		
+			if($nu_name != ""){
+				$this->file["name"] = $nu_name;
+			}
+		
+		// ff
+
+			// Clean up file name (only lowercase letters, numbers and underscores)
+			$this->file["name"] = ereg_replace("[^a-z0-9._]", "", str_replace(" ", "_", str_replace("%20", "_", strtolower($this->file["name"]))));
+			
+			// Clean up text file breaks
+			if(stristr($this->file["type"], "text")) {
+				$this->cleanup_text_file($this->file["tmp_name"]);
+			}
+			
+			// get the raw name of the file (without its extention)
+			if(ereg("(\.)([a-z0-9]{2,5})$", $this->file["name"])) {
+				$pos = strrpos($this->file["name"], ".");
+				if(!$this->file["extention"]) { 
+					$this->file["extention"] = substr($this->file["name"], $pos, strlen($this->file["name"]));
+				}
+				$this->file['raw_name'] = substr($this->file["name"], 0, $pos);
+			} else {
+				$this->file['raw_name'] = $this->file["name"];
+				if ($this->file["extention"]) {
+					$this->file["name"] = $this->file["name"] . $this->file["extention"];
+				}
+			}
+			
+			switch((int) $overwrite_mode) {
+				case 1: // overwrite mode
+					if (@copy($this->file["tmp_name"], $this->path . $this->file["name"])) {
+						$success = true;
+					} else {
+						$success     = false;
+						$this->error = $this->get_error(5);
+					}
+					break;
+				case 2: // create new with incremental extention
+					while(file_exists($this->path . $this->file['raw_name'] . $copy . $this->file["extention"])) {
+						$copy = "_copy" . $n;
+						$n++;
+					}
+					$this->file["name"]  = $this->file['raw_name'] . $copy . $this->file["extention"];
+					if (@copy($this->file["tmp_name"], $this->path . $this->file["name"])) {
+						$success = true;
+					} else {
+						$success     = false;
+						$this->error = $this->get_error(5);
+					}
+					break;
+				default: // do nothing if exists, highest protection
+					if(file_exists($this->path . $this->file["name"])){
+						$this->error = $this->get_error(4);
+						$success     = false;
+					} else {
+						if (@copy($this->file["tmp_name"], $this->path . $this->file["name"])) {
+							$success = true;
+						} else {
+							$success     = false;
+							$this->error = $this->get_error(5);
+						}
+					}
+					break;
+			}
+			
+			if(!$success) { unset($this->file['tmp_name']); }
+			return (bool) $success;
+		} else {
+			$this->error = $this->get_error(3);
+			return FALSE;
+		}
+	}
+	
+	
+	/**
+	 * string get_error(int error_code);
+	 * 
+	 * Gets the correct error message for language set by constructor
+	 * 
+	 * @param error_code		(int) error code
+	 * 
+	 */
+	function get_error($error_code='') {
+		$error_message = array();
+		$error_code    = (int) $error_code;
+		
+		switch ( $this->language ) {
+			// French (fr)
+			case 'fr':
+				$error_message[0] = "Aucun fichier n'a &eacute;t&eacute; envoy&eacute;";
+				$error_message[1] = "Taille maximale autoris&eacute;e d&eacute;pass&eacute;e. Le fichier ne doit pas &ecirc;tre plus gros que " . $this->max_filesize/1000 . " Ko (" . $this->max_filesize . " octets).";
+				$error_message[2] = "Taille de l'image incorrecte. L'image ne doit pas d&eacute;passer " . $this->max_image_width . " pixels de large sur " . $this->max_image_height . " de haut.";
+				$error_message[3] = "Type de fichier incorrect. Seulement les fichiers de type " . str_replace("|", " or ", $this->acceptable_file_types) . " sont autoris&eacute;s.";
+				$error_message[4] = "Fichier '" . $this->path . $this->file["name"] . "' d&eacute;j&aacute; existant, &eacute;crasement interdit.";
+				$error_message[5] = "La permission a ni&eacute;. Incapable pour copier le fichier &aacute; '" . $this->path . "'";
+			break;
+			
+			// German (de)
+			case 'de':
+				$error_message[0] = "Es wurde keine Datei hochgeladen";
+				$error_message[1] = "Maximale Dateigr&ouml;sse &uuml;berschritten. Datei darf nicht gr&ouml;sser als " . $this->max_filesize/1000 . " KB (" . $this->max_filesize . " bytes) sein.";
+				$error_message[2] = "Maximale Bildgr&ouml;sse &uuml;berschritten. Bild darf nicht gr&ouml;sser als " . $this->max_image_width . " x " . $this->max_image_height . " pixel sein.";
+				$error_message[3] = "Nur " . str_replace("|", " oder ", $this->acceptable_file_types) . " Dateien d&uuml;rfen hochgeladen werden.";
+				$error_message[4] = "Datei '" . $this->path . $this->file["name"] . "' existiert bereits.";
+				$error_message[5] = "Erlaubnis hat verweigert. Unf&amul;hig, Akte zu '" . $this->path . "'";
+			break;
+
+			// Dutch (nl)
+			case 'nl':
+				$error_message[0] = "Er is geen bestand geupload";
+				$error_message[1] = "Maximum bestandslimiet overschreden. Bestanden mogen niet groter zijn dan " . $this->max_filesize/1000 . " KB (" . $this->max_filesize . " bytes).";
+				$error_message[2] = "Maximum plaatje omvang overschreven. Plaatjes mogen niet groter zijn dan " . $this->max_image_width . " x " . $this->max_image_height . " pixels.";
+				$error_message[3] = "Alleen " . str_replace("|", " of ", $this->acceptable_file_types) . " bestanden mogen worden geupload.";
+				$error_message[4] = "Bestand '" . $this->path . $this->file["name"] . "' bestaat al.";
+				$error_message[5] = "Toestemming is geweigerd. Kon het bestand niet naar '" . $this->path . "' copieren.";
+				//$error_message[5] = "Toestemming ontkende. Onbekwaam dossier aan '" . $this->path . "'";
+			break;
+
+			// Italian (it)
+			case 'it':
+				$error_message[0] = "Il file non e' stato salvato";
+				$error_message[1] = "Il file e' troppo grande. La dimensione massima del file e' " . $this->max_filesize/1000 . " Kb (" . $this->max_filesize . " bytes).";
+				$error_message[2] = "L'immagine e' troppo grande. Le dimensioni massime non possono essere superiori a " . $this->max_image_width . " pixel di larghezza per " . $this->max_image_height . " d'altezza.";
+				$error_message[3] = "Il tipo di file non e' valido. Solo file di tipo " . str_replace("|", " o ", $this->acceptable_file_types) . " sono autorizzati.";
+				$error_message[4] = "E' gia' presente un file con nome " . $this->path . $this->file["name"];
+				$error_message[5] = "Permesso negato. Impossibile copiare il file in '" . $this->path . "'";
+			break;
+
+  			// Finnish
+			case 'fi':
+				$error_message[0] = "Tiedostoa ei l&amul;hetetty.";
+				$error_message[1] = "Tiedosto on liian suuri. Tiedoston koko ei saa olla yli " . $this->max_filesize/1000 . " KB (" . $this->max_filesize . " tavua).";
+				$error_message[2] = "Kuva on liian iso. Kuva ei saa olla yli " . $this->max_image_width . " x " . $this->max_image_height . " pikseli&amul;.";
+				$error_message[3] = "Vain " . str_replace("|", " tai ", $this->acceptable_file_types) . " tiedostoja voi tallentaa kuvapankkiin.";
+				$error_message[4] = "Tiedosto '" . $this->path . $this->file["name"] . "' on jo olemassa.";
+				$error_message[5] = "Ei k&amul;ytt&ouml;oikeutta. Tiedostoa ei voi kopioida hakemistoon '" . $this->path . "'";
+			break;
+
+ 			// Spanish
+			case 'es':
+				$error_message[0] = "No se subi&oacute; ning&uacute;n archivo.";
+				$error_message[1] = "Se excedi&oacute; el tama&ntilde;o m&aacute;ximo del archivo. El archivo no puede ser mayor a " . $this->max_filesize/1000 . " KB (" . $this->max_filesize . " bytes).";
+				$error_message[2] = "Se excedieron las dimensiones de la imagen. La imagen no puede medir m&aacute;s de " . $this->max_image_width . " (w) x " . $this->max_image_height . " (h) pixeles.";
+				$error_message[3] = "El tipo de archivo no es v&aacute;lido. S&oacute;lo los archivos " . str_replace("|", " o ", $this->acceptable_file_types) . " son permitidos.";
+				$error_message[4] = "El archivo '" . $this->path . $this->file["name"] . "' ya existe.";
+				$error_message[5] = "Permiso denegado. No es posible copiar el archivo a '" . $this->path . "'";
+			break;		
+
+			// Norwegian
+			case 'no':
+				$error_message[0] = "Ingen fil ble lastet opp.";
+				$error_message[1] = "Max filst&oslash;rrelse ble oversteget. Filen kan ikke være st&oslash;rre ennn " . $this->max_filesize/1000 . " KB (" . $this->max_filesize . " byte).";
+				$error_message[2] = "Max bildest&oslash;rrelse ble oversteget. Bildet kan ikke være st&oslash;rre enn " . $this->max_image_width . " x " . $this->max_image_height . " piksler.";
+				$error_message[3] = "Bare " . str_replace("|", " tai ", $this->acceptable_file_types) . " kan lastes opp.";
+				$error_message[4] = "Filen '" . $this->path . $this->file["name"] . "' finnes fra f&oslash;r.";
+				$error_message[5] = "Tilgang nektet. Kan ikke kopiere filen til '" . $this->path . "'";
+			break;
+
+			// Danish
+			case 'da':
+				$error_message[0] = "Ingen fil blev uploaded";
+				$error_message[1] = "Den maksimale filstørrelse er overskredet. Filerne må ikke være større end " . $this->max_filesize/1000 . " KB (" . $this->max_filesize . " bytes).";
+				$error_message[2] = "Den maksimale billedstørrelse er overskredet. Billeder må ikke være større end " . $this->max_image_width . " x " . $this->max_image_height . " pixels.";
+				$error_message[3] = "Kun " . str_replace("|", " or ", $this->acceptable_file_types) . " kan uploades.";
+				$error_message[4] = "Filen '" . $this->path . $this->file["name"] . "' eksisterer allerede.";
+				$error_message[5] = "Adgang nægtet! Er ikke i stand til at kopiere filen til '" . $this->path . "'";
+			break;
+
+
+			// English
+			default:
+				$error_message[0] = "No file was uploaded";
+				$error_message[1] = "Maximum file size exceeded. File may be no larger than " . $this->max_filesize/1000 . " KB (" . $this->max_filesize . " bytes).";
+				$error_message[2] = "Maximum image size exceeded. Image may be no more than " . $this->max_image_width . " x " . $this->max_image_height . " pixels.";
+				$error_message[3] = "Only " . str_replace("|", " or ", $this->acceptable_file_types) . " files may be uploaded.";
+				$error_message[4] = "File '" . $this->path . $this->file["name"] . "' already exists.";
+				$error_message[5] = "Permission denied. Unable to copy file to '" . $this->path . "'";
+			break;
+		}
+		
+		// for backward compatability:
+		$this->errors[$error_code] = $error_message[$error_code];
+		
+		return $error_message[$error_code];
+	}
+
+
+	/**
+	 * void cleanup_text_file (string file);
+	 * 
+	 * Convert Mac and/or PC line breaks to UNIX by opening
+	 * and rewriting the file on the server
+	 * 
+	 * @param file			(string) Path and name of text file
+	 * 
+	 */
+	function cleanup_text_file($file){
+		// chr(13)  = CR (carridge return) = Macintosh
+		// chr(10)  = LF (line feed)       = Unix
+		// Win line break = CRLF
+		$new_file  = '';
+		$old_file  = '';
+		$fcontents = file($file);
+		while (list ($line_num, $line) = each($fcontents)) {
+			$old_file .= $line;
+			$new_file .= str_replace(chr(13), chr(10), $line);
+		}
+		if ($old_file != $new_file) {
+			// Open the uploaded file, and re-write it with the new changes
+			$fp = fopen($file, "w");
+			fwrite($fp, $new_file);
+			fclose($fp);
+		}
+	}
+
+
+	function resize($filename, $max_width, $max_height, $quality=80) {  
+
+		// Proportionally resize the image to the max sizes specified above
+		$x_ratio = $max_width / $this->file["width"];
+	    $y_ratio = $max_height / $this->file["height"];
+        $retamanha = true;
+        
+		if( ($this->file["width"] <= $max_width) && ($this->file["height"] <= $max_height) ) {
+	    	$tn_width = $this->file["width"];
+	        $tn_height = $this->file["height"];
+		} elseif (($x_ratio * $this->file["height"]) < $max_height) {
+			$tn_height = ceil($x_ratio * $this->file["height"]);
+			$tn_width = $max_width;
+		} else {
+			$tn_width = ceil($y_ratio * $this->file["width"]);
+			$tn_height = $max_height;
+		}
+        $dest_x = ($max_width - $tn_width) / 2;
+        $dest_y = ($max_height - $tn_height) / 2;
+		// Increase memory limit to support larger files
+		ini_set('memory_limit', '32M');
+
+		// Create the new image!
+		if($this->file["extention"] == '.jpg') {
+			$src = imageCreateFromJpeg($this->path . $this->file["name"]);
+		} elseif ($this->file["extention"] == '.gif') {
+			$src = imageCreateFromGif($this->path . $this->file["name"]);
+		} else {
+			return;		// una salida poco elegante
+		}
+		if($src) {
+			$dst = imageCreateTrueColor($max_width, $max_height);
+			if($dst) {
+				$bgColor = imagecolorallocate($dst, 255,255,255);
+		  		ImageFilledRectangle ($dst, 0, 0, $max_width, $max_height, $bgColor);
+
+				imageCopyResampled($dst, $src, $dest_x, $dest_y, 0, 0, $tn_width, $tn_height, $this->file["width"], $this->file["height"]);
+
+				imagejpeg($dst, $this->path . $filename, $quality);
+
+				imageDestroy($dst);
+			}
+			imageDestroy($src);
+		}
+	}
+
+	function crop($filename, $max_width, $max_height, $percent=1.0, $quality=80) {  
+
+		$new_width = $this->file["width"] * $percent;
+		$new_height = $this->file["height"] * $percent;
+
+		// Increase memory limit to support larger files
+		ini_set('memory_limit', '32M');
+
+		// Create the new image!
+		if($this->file["extention"] == '.jpg') {
+			$src = imageCreateFromJpeg($this->path . $this->file["name"]);
+		} elseif ($this->file["extention"] == '.gif') {
+			$src = imageCreateFromGif($this->path . $this->file["name"]);
+		} else {
+			return;		// una salida poco elegante
+		}
+		if($src) {
+			$dst = imageCreateTrueColor($max_width, $max_height);
+			if($dst) {
+				$bgColor = imagecolorallocate($dst, 255,255,255);
+		  		ImageFilledRectangle ($dst, 0, 0, $max_width, $max_height, $bgColor);
+
+				imageCopyResampled($dst, $src, -($new_width/2) + ($max_width/2), -($new_height/2) + ($max_height/2), 0, 0, $new_width, $new_height, $this->file["width"], $this->file["height"]);
+
+				imagejpeg($dst, $this->path . $filename, $quality);
+
+				imageDestroy($dst);
+			}
+			imageDestroy($src);
+		}
+	}
+
+	function delete_file() {
+		@unlink($this->path . $this->file["name"]);
+	}
+}
+
+
+
+
+
+
+/*
+<readme>
+
+	fileupload-class.php can be used to upload files of any type
+	to a web server using a web browser. The uploaded file's name will 
+	get cleaned up - special characters will be deleted, and spaces 
+	get replaced with underscores, and moved to a specified 
+	directory (on your server). fileupload-class.php also does its best to 
+	determine the file's type (text, GIF, JPEG, etc). If the user 
+	has named the file with the correct extension (.txt, .gif, etc), 
+	then the class will use that, but if the user tries to upload 
+	an extensionless file, PHP does can identify text, gif, jpeg, 
+	and png files for you. As a last resort, if there is no 
+	specified extension, and PHP can not determine the type, you 
+	can set a default extension to be added.
+	
+	SETUP:
+		Make sure that the directory that you plan on uploading 
+		files to has enough permissions for your web server to 
+		write/upload to it. (usually, this means making it world writable)
+			- cd /your/web/dir
+			- chmod 777 <fileupload_dir>
+		
+		The HTML FORM used to upload the file should look like this:
+		<form method="post" action="upload.php" enctype="multipart/form-data">
+			<input type="file" name="userfile"> 
+			<input type="submit" value="Submit">
+		</form>
+
+
+	USAGE:
+		// Create a new instance of the class
+		$my_uploader = new uploader;
+		
+		// OPTIONAL: set the max filesize of uploadable files in bytes
+		$my_uploader->max_filesize(90000);
+
+		// OPTIONAL: if you're uploading images, you can set the max pixel dimensions 
+		$my_uploader->max_image_size(150, 300); // max_image_size($width, $height)
+		
+		// UPLOAD the file
+		$my_uploader->upload("userfile", "", ".jpg");
+
+		// MOVE THE FILE to its final destination
+		//	$mode = 1 ::	overwrite existing file
+		//	$mode = 2 ::	rename new file if a file
+		//	       			with the same name already 
+		//         			exists: file.txt becomes file_copy0.txt
+		//	$mode = 3 ::	do nothing if a file with the
+		//	       			same name already exists
+		$my_uploader->save_file("/your/web/dir/fileupload_dir", int $mode);
+		
+		// Check if everything worked
+		if ($my_uploader->error) {
+			echo $my_uploader->error . "<br>";
+		
+		} else {
+			// Successful upload!
+			$file_name = $my_uploader->file['name'];
+			print($file_name . " was successfully uploaded!");
+		
+		}
+		
+</readme>
+
+
+<license>
+
+	///// fileupload-class.php /////
+	Copyright (c) 1999, 2002, 2003 David Fox, Angryrobot Productions
+	All rights reserved.
+	
+	Redistribution and use in source and binary forms, with or without 
+	modification, are permitted provided that the following conditions 
+	are met:
+	1. Redistributions of source code must retain the above copyright 
+	   notice, this list of conditions and the following disclaimer.
+	2. Redistributions in binary form must reproduce the above 
+	   copyright notice, this list of conditions and the following 
+	   disclaimer in the documentation and/or other materials provided 
+	   with the distribution.
+	3. Neither the name of author nor the names of its contributors 
+	   may be used to endorse or promote products derived from this 
+	   software without specific prior written permission.
+
+	DISCLAIMER:
+	THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" 
+	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
+	TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+	PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR 
+	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 
+	USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+	AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+	IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+	THE POSSIBILITY OF SUCH DAMAGE.
+
+</license>
+
+*/
+?>

src/addCandidato.php

@@ -27,12 +27,6 @@ if(stripinput($_POST['action'])=="add"){
 			$errores[]="22";
 	}
 
-/*NO se valida el perfil para candidatos nuevos con estado 510 (pendiente de clasificacion) que es el por defecto
-	if((count($perfil)==1) && ($perfil["0"]=="")){
-			$errores_persona .= $locale['1705']."<br />";
-			$errores[]="23";
-	}
-*/
 	include_once("verificar_candidato.php");
 	
 	if(count($errores)==0){
@@ -60,6 +54,7 @@ if(stripinput($_POST['action'])=="add"){
 		$camposQuitar["titulaciones"]=$_POST['titulaciones'];
 		$camposQuitar["provincia_deseada"]=$_POST['provincia_deseada'];
 		$camposQuitar["provincias_no_deseadas"]=$_POST['provincias_no_deseadas'];
+		$camposQuitar["tipo_curriculum"]=$_POST['tipo_curriculum'];		
 		$camposQuitar["perfil"]=$_POST['perfil'];
 		$camposQuitar["action"]=stripinput($_POST['action']);
 		$camposQuitar["diaentre"]=stripinput($_POST['diaentre']);
@@ -105,7 +100,10 @@ if(stripinput($_POST['action'])=="add"){
 
 
 				$candidatoNew->addPerfiles($_POST['perfil']);
-				$candidatoNew->addCurriculum($_FILES['userfile']);
+				$candidatoNew->addCurriculum($_FILES['userfile'], $_POST['tipo_curriculum']);
+				//Subimos la foto
+				uploadImagenCandidato($idCandidatoNew, 250, 250, 150, 150);
+				
 				header("Location: detalle_candidato.php?oid=".$idCandidatoNew);
 			} else {
 				$tipomsg="error";
@@ -224,6 +222,8 @@ echo '</td>';
 //CAMPO FOTO
 echo '<td ';
 echo ' width="25%" '.$ett.' textalign="right">';
+echo $locale['Candidato006'] .':<br>';
+echo '<input name="candidato_imagen" type="file" style="width:250px" class="data">';
 echo'</td>';
 echo '</tr>';
 
@@ -387,12 +387,12 @@ echo '<div class="encabezado">'.$locale['1549'].'</div>';
 echo '<table align="center" width="100%">';
 echo '<tr><td colspan="6">';
 	menu_curriculums($_GET['oid'], "candidato");
-echo '</td></tr><tr>';
+echo '</td></tr><td colspan="6" textalign="right">';
-echo '<input type="hidden" name="MAX_FILE_SIZE" value="10000000"><td colspan="6" textalign="right">'.$locale['125'].'<br>';
+echo '<input type="hidden" name="MAX_FILE_SIZE" value="10000000">'.$locale['125'].'&nbsp;&nbsp;';
-echo '<input name="userfile" type="file">';
+echo '<input name="userfile" type="file">&nbsp;&nbsp;'.$locale['00208']. '&nbsp;&nbsp;';
-echo '<input value="Subir" type="submit">';
+        rellena_desplegable_select_oidCol("tipo_curriculum","oid","tipo","tipo_curriculum","","0");
+echo '&nbsp;&nbsp;<input value="Subir" type="submit">';
 echo '</td></tr></table>';
-echo '<input type="submit" value="'.$locale['802'].'" class="button">';
 
 echo "</form>";
 include_once("html/pie.php");

src/addEmpleado.php

@@ -79,7 +79,7 @@ if(stripinput($_POST['action'])=="add"){
 				}
 				$empleadoNew->addProvinciasDeseadas($_POST['provincia_deseada']);
 				$empleadoNew->addPerfiles($_POST['perfil']);
-				$empleadoNew->addCurriculum($_FILES['userfile']);
+				$empleadoNew->addCurriculum($_FILES['userfile'], $_POST['tipo_curriculum']);
 				header("Location: detalle_empleado.php?oid=".$idEmpleadoNew);
 			} else {
 				$tipomsg="error";
@@ -251,10 +251,11 @@ echo $html->listaSelect("titulaciones","oid","id","titulaciones",array("",$local
         </tr>';
         echo '<tr><td colspan="6">';
 		menu_curriculums($_GET['oid'], "candidato");
-        echo '</td></tr><tr>';
+echo '</td></tr><td colspan="6" textalign="right">';
-        echo '<input type="hidden" name="MAX_FILE_SIZE" value="10000000">
+echo '<input type="hidden" name="MAX_FILE_SIZE" value="10000000">'.$locale['125'].'&nbsp;&nbsp;';
-        <td colspan="6" textalign="right">'.$locale['125'].'<br>';
+echo '<input name="userfile" type="file">&nbsp;&nbsp;'.$locale['00208']. '&nbsp;&nbsp;';
-        echo '<input name="userfile" type="file">';
+        rellena_desplegable_select_oidCol("tipo_curriculum","oid","tipo","tipo_curriculum","","0");
+echo '&nbsp;&nbsp;<input value="Subir" type="submit">';
 	echo '</td></tr></table>';
 
 echo '</table>';

src/addOferta.php

@@ -8,14 +8,14 @@ include_once("Objects/Pedido.php");
 include_once("Objects/HTML.php");
 
 $html = new HTML($locale);
-
 $errores = array();
+$usuario = $_SESSION["usuario"];
+$solicitud=$_GET['solicitud'];    
 
 // Todas las variables
 if (!empty($_POST)) {
     print_r($_POST);
 
-    $solicitud = "";
     if (!empty($_POST['solicitud'])) {
         $solicitud = $_POST['solicitud'][0];
     }
@@ -34,6 +34,8 @@ if (!empty($_POST)) {
       $idiomas=$_POST['idiomas'];
       $provincias=$_POST['provincias']; */
     $observaciones = $_POST['observaciones'];
+    $salario_ofertado = $_POST['salario_ofertado'];    
+    $gerente=$usuario->getValor("oid");
     /* $pesoTec=$_POST['pesoTec'];
       $pesoIdi=$_POST['pesoIdi'];
       $pesoPer=$_POST['pesoPer'];
@@ -42,7 +44,7 @@ if (!empty($_POST)) {
       if($usuario->tieneRol("1")){
       $gerente=$_POST['gerente'];
       } else {
-      $gerente=$usuario->getValor("oid");
+      
       }
      */
     if ($_POST['action'] == "add") {
@@ -59,17 +61,18 @@ if (!empty($_POST)) {
             $arrayInsert["pedido"] = $solicitud;
             $arrayInsert["obsGerente"] = $observaciones;
             $arrayInsert["estado"] = "100";
+            $arrayInsert["gerente"]=$gerente;
+            $arrayInsert["salario_ofertado"] = $salario_ofertado;            
 
             /* $arrayInsert["prioridad"]= $prioridad;
               $arrayInsert["empleados"]=$empleados;
               $arrayInsert["duracion"]=$duracion;
-              $arrayInsert["gerente"]=$gerente;
               $arrayInsert["cliente"]=$clientes;
               $arrayInsert["salario_min"]=$salario_min;
               $arrayInsert["salario_max"]=$salario_max;
               $arrayInsert["procedencia"]=$procedencia;
 
-              $arrayInsert["estado"]="110";
+              $arrayInsert["estado"]="100";
               $arrayInsert["pesoIdioma"]=$pesoIdi;
               $arrayInsert["pesoPerfil"]=$pesoPer;
               $arrayInsert["pesoTecno"]=$pesoTec; */
@@ -98,7 +101,7 @@ if (!empty($_POST)) {
     }
 } else {
     $referencia = "";
-    $solicitud = "";
+    $gerente = $usuario->getValor("oid");
     $observaciones = "";
 }
 
@@ -121,7 +124,6 @@ if (in_array("1", $errores))
     echo " class=\"errorcampo\"";
 
 echo ">" . $locale['1025'] . ":<br/>";
-
 rellena_desplegable_pedidos_estado("solicitud", "130, 140", array($solicitud));
 
 echo " </td>";
@@ -134,6 +136,10 @@ echo '<tr>' .
  '<td colspan="3" align="center">' . $locale['135'] .
  '<br><textarea name="observaciones" rows="10" cols="120" style="overflow: auto; width:100%;">' . nl2br($observaciones) . '</textarea></td>' .
  '</tr>';
+ 
+ echo '<tr><td>'.$locale['Ofertas010'].'<br><input type="text" name="salario_ofertado" value="'.$salario_ofertado.'" size="15" maxlength="20"></td>';
+ 
+ 
 // Botones de guardar y restablecer
 echo "<tr><td colspan=\"3\" align=\"center\">";
 echo '<input type="submit" value="' . $locale['gu'] . '" onclick="return comprobar_registro(this)" class="button">';

src/addPedido.php

@@ -112,8 +112,8 @@ if(!empty($_POST)) {
 	$denominacion_cliente="";
 	$prioridad="";
 	$empleados="";
-	$duracion="";
+	$duracion="12";
-	$clientes="";
+	$clientes="2";
 	$perfiles=array();
 	$salario_min="";
 	$salario_max="";
@@ -129,10 +129,10 @@ if(!empty($_POST)) {
 	$viajar="";
 	$internacional="";	
 	$direccion_solicitud="";
-	$fecha_solicitud_cliente="";
+	$fecha_solicitud_cliente = date("Y-m-d", time());		
 	$fecha_inicio_servicio="";
-	$fecha_fin_servicio="";
+	$fecha_fin_servicio = date("Y-12-31", time());
-	$fecha_recepcion_solicitud="";
+	$fecha_recepcion_solicitud = date("Y-m-d", time());
 
 }
 

src/anadir_todos_cv.php

@@ -0,0 +1,27 @@
+<?php
+include_once("seguridad.php");
+include_once("functions_solr.php");
+
+echo "Añadiendo todos los CV a Apache Solr...".PHP_EOL;
+$directorio = constante("srcDocs").SLASH."cv".SLASH;
+if (!@file_exists($directorio)){
+    return false;
+}
+
+$ficheros_cv = scandir($directorio);
+foreach ($ficheros_cv as $fichero) {
+    if ($fichero != "." && $fichero != "..") {
+        echo $fichero.PHP_EOL;
+        $oid = explode("-", $fichero);
+        try {
+            solr_anadir_cv($oid[0], $directorio.$fichero);
+        }
+        catch(Exception $e) {
+            dbug('Message: ' .$e->getMessage());
+            echo dbug('print');
+        }
+    }
+}
+echo "Terminado.".PHP_EOL;
+
+?>

src/aplicacion.php

@@ -9,7 +9,12 @@ include_once("html/cabecera.php");
 
 echo "<h2>".$locale['002']."</h2>";
 
-include("tablero.php");
+if(!$usuario->tieneRol("7")) { 
+	include("tablero.php");
+}
+else {
+	header("Location: lista_pedidos.php");
+}
 
 if($_SESSION["oid"]){
 	include_once("alarmas.php");

src/borrar_curriculum.php

@@ -5,7 +5,7 @@ include("functions.php");
 include_once("Objects/Candidato.php");
 
 $oid = stripinput($_GET["oid"]);
-$curriculum = stripinput($_GET["curriculum"]);
+$curriculum = $_GET["curriculum"];
 $fecha = stripinput($_GET["fecha"]);
 $tipo = stripinput($_GET["tipo"]);
 

src/borrar_todos_cv.php

@@ -0,0 +1,16 @@
+<?php
+include_once("seguridad.php");
+include_once("functions_solr.php");
+
+echo "Borrar todos los CV de Apache Solr...".PHP_EOL;
+
+try {
+    solr_eliminar_todo();    
+}
+catch(Exception $e) {
+    dbug('Message: ' .$e->getMessage());
+    echo dbug('print');
+}
+echo "Terminado.".PHP_EOL;
+
+?>

src/buscar_candidato.php

@@ -0,0 +1,321 @@
+<?php
+include("seguridad.php");
+include("functions.php");
+
+// Sólo los administradores y rrhh pueden buscar
+if(!$usuario->tieneRol("1")
+	&& !$usuario->tieneRol("4")){
+        header("Location: aplicacion.php?e=permiso");
+        exit;
+}
+
+include_once("html/cabecera.php");
+include_once("Objects/HTML.php");
+$html=new HTML($locale);
+echo $html->menuCandidatos();
+
+include_once("Objects/ListaCandidatos.php");
+$listaCandidatos=new ListaCandidatos($usuario,"","","10"); 
+//CAMPOS EN LOS QUE BUSCAR LA PALABRA
+$resultado=$listaCandidatos->getCamposBusqueda();
+$camposPermitidos = array("nombre", "apellidos", "observaciones");
+
+////////////////////////////
+// Proceso del Formulario
+///////////////////////////
+$errores=array();
+$error = ""; 
+$order_by="";
+if(!empty($_GET["order"])){
+	$order_by = " ORDER by ".$_GET["order"]." ".$_GET["modo"];
+} else {
+	$order_by = " ORDER BY fecha_modificacion DESC";
+}
+$modo = (!empty($_GET["modo"])) ? stripinput($_GET["modo"]) : "";
+
+
+if (isset($_GET['byEstado'])) {
+	if ((isset($_SESSION['palabra'])) && ($_SESSION['palabra'] != ""))
+		$_POST['palabra'] = $_SESSION['palabra'];
+
+	if ((isset($_SESSION['campos'])) && ($_SESSION['campos'] != ""))
+		$_POST['campo'] = $_SESSION['campos'];
+
+	if ((isset($_SESSION['salario_busqueda_min'])) && ($_SESSION['salario_busqueda_min'] != ""))
+		$_POST['salario_busqueda_min'] = $_SESSION['salario_busqueda_min'];
+
+	if ((isset($_SESSION['salario_busqueda_max'])) && ($_SESSION['salario_busqueda_max'] != ""))
+		$_POST['salario_busqueda_max'] = $_SESSION['salario_busqueda_max'];
+		
+	if ((isset($_SESSION['idiomas'])) && ($_SESSION['idiomas'] != ""))
+		$_POST['idiomas'] = $_SESSION['idiomas'];
+
+	if ((isset($_SESSION['perfiles_tecnicos'])) && ($_SESSION['perfiles_tecnicos'] != ""))
+		$_POST['id_perfil_tecnico'] = $_SESSION['perfiles_tecnicos'];
+
+	if ((isset($_SESSION['perfiles_funcionales'])) && ($_SESSION['perfiles_funcionales'] != ""))
+		$_POST['id_perfil_funcional'] = $_SESSION['perfiles_funcionales'];
+		
+	if ((isset($_SESSION['tecnologias'])) && ($_SESSION['tecnologias'] != ""))
+		$_POST['tecnologias'] = $_SESSION['tecnologias'];
+}
+
+if ((isset($_POST['buscar'])) || (isset($_GET['byEstado']))) {
+	$palabra=$_POST['palabra']; 
+	$campos=$_POST['campo']; 
+	$tipoPedidos=$_GET['byEstado'];
+	$whereCampos="";
+	$tablas = "usuarios";
+	
+	foreach($campos as $campo)
+		if ($campo != "") {
+			if ($whereCampos != "") {
+				$whereCampos = $whereCampos . " or ";
+		    }
+                    if ($campo == "cv") {
+                        $ids = solr_buscar_palabra($palabra);
+                        $whereCampos .= "usuarios.oid in (".implode(",", $ids).")";
+                    }
+                    else {
+                        $whereCampos = $whereCampos . "usuarios.". $campo ." like '%". $palabra ."%'";
+                    }
+		}
+    if (($palabra != "") && (count($campos) == 0)) {
+	   $errores[]="1";
+       $error .= $locale['01903']."<br />";
+    }   
+
+	$whereSalario="";
+	$salario_busqueda_min=$_POST['salario_busqueda_min']; 	
+    $salario_busqueda_max=$_POST['salario_busqueda_max']; 		
+    //VALIDAMOS QUE LOS VALORES SELECCIONADOS SE CORRESPONDAN A NUMÉRICOS Y QUE EL MIN SEA MENOR QUE EL MAX
+	$resul;
+	$valor_minimo="";
+	$valor_maximo="";
+	$bdconsulta=new BD();
+	
+	$sql = "SELECT nombre from salario where (id = ". $salario_busqueda_min .")";	
+	$resul = $bdconsulta->execQuery($sql);
+	while($fila = mysql_fetch_array($resul)) { 
+	   $valor_minimo = str_replace(".", "", $fila["nombre"]);
+    }
+
+	$sql = "SELECT nombre from salario where (id = ". $salario_busqueda_max .")";	
+	$resul = $bdconsulta->execQuery($sql);
+	while($fila = mysql_fetch_array($resul)) { 
+	   $valor_maximo = str_replace(".", "", $fila["nombre"]);
+    }
+
+	if (($valor_minimo!="")) {
+    	if (is_numeric($valor_minimo)) {
+           $tablas .= ", salario salario1";	
+           $whereSalario = "((replace(replace(salario1.nombre, ',', '' ) , '.', '' ) >= ". $valor_minimo . ") and (salario1.id = usuarios.salario_min))";
+        }	
+        else {
+           $errores[]="2";
+           $error .= $locale['01904']."<br />";		   		   
+        }
+    }
+
+	if (($valor_maximo!="")) {
+		if (is_numeric($valor_maximo) && ($valor_minimo <= $valor_maximo)) {
+			$tablas .= ", salario salario2";	
+			if ($whereSalario != "") {
+				$whereSalario = $whereSalario . " and ";
+			}   
+			$whereSalario .= "((replace(replace(salario1.nombre, ',', '' ) , '.', '' ) <= ". $valor_maximo . ") and (salario2.id = usuarios.salario_max))";
+		}	
+		else {
+			$errores[]="2";
+			$error .= $locale['01904']."<br />";		   		   
+		}
+    }   
+
+	$SemaforoPerfilTec = false;
+    $perfiles_tec = $_POST["id_perfil_tecnico"];
+	$wherePerfilesTec="";
+	foreach($perfiles_tec as $perfil)
+		if ($perfil != "") {
+			if(!$SemaforoPerfilTec)
+               $tablas .= ", capacidades capacidades1";	
+        	$SemaforoPerfilTec = true;
+        	
+			if ($wherePerfilesTec != "") {
+				$wherePerfilesTec = $wherePerfilesTec . " or ";
+		    }
+		    $wherePerfilesTec = $wherePerfilesTec . "(capacidades1.id_perfil_tecnico = ". $perfil ." and capacidades1.id_usuario = usuarios.oid)";
+		}
+		
+	$SemaforoPerfilFun = false;
+    $perfiles_fun = $_POST["id_perfil_funcional"];
+	$wherePerfilesFun="";
+	foreach($perfiles_fun as $perfil)
+		if ($perfil != "") {
+			if(!$SemaforoPerfilFun)
+               $tablas .= ", capacidades capacidades2";	
+        	$SemaforoPerfilFun = true;
+        	
+			if ($wherePerfilesFun != "") {
+				$wherePerfilesFun = $wherePerfilesFun . " or ";
+		    }
+		    $wherePerfilesFun = $wherePerfilesFun . "(capacidades2.id_perfil_funcional = ". $perfil ." and capacidades2.id_usuario = usuarios.oid)";
+		}
+		
+	$SemaforoTecnologias = false;
+    $tecnologias = $_POST["tecnologias"];
+	$whereTecnologias="";
+	foreach($tecnologias as $tecnologia)
+		if ($tecnologia != "") {
+			if(!$SemaforoTecnologias)
+               $tablas .= ", capacidades capacidades3, capacidades_perfil_tecnologias";	
+        	$SemaforoTecnologias = true;
+        	
+			if ($whereTecnologias != "") {
+				$whereTecnologias = $whereTecnologias . " or ";
+		    }
+		    $whereTecnologias = $whereTecnologias . "(capacidades_perfil_tecnologias.id_tecnologia = ". $tecnologia ." and capacidades_perfil_tecnologias.id_capacidad = capacidades3.id and capacidades3.id_usuario = usuarios.oid)";
+		}
+
+	$SemaforoIdiomas = false;
+    $idiomas = $_POST["idiomas"];
+	$whereIdiomas="";
+	foreach($idiomas as $idioma)
+		if ($idioma != "") {
+			if(!$SemaforoIdiomas)
+               $tablas .= ", idioma_usuario";	
+        	$SemaforoIdiomas = true;
+        	
+			if ($whereIdiomas != "") {
+				$whereIdiomas = $whereIdiomas . " or ";
+		    }
+		    $whereIdiomas = $whereIdiomas . "(idioma_usuario.idioma = ". $idioma ." and idioma_usuario.oid_i = usuarios.oid)";
+		}
+
+//Vamos a meter los parametros de busqueda en session para que en la paginación no se pierdan
+$_SESSION['palabra']=$palabra;
+$_SESSION['campos']=$campos;
+$_SESSION['idiomas']=$idiomas;
+$_SESSION['perfiles_tecnicos']=$perfiles_tec;
+$_SESSION['perfiles_funcionales']=$perfiles_fun;
+$_SESSION['tecnologias']=$tecnologias;
+$_SESSION['salario_busqueda_min']=$salario_busqueda_min;
+$_SESSION['salario_busqueda_max']=$salario_busqueda_max;
+
+	if ($error == "") {
+		$query = "SELECT distinct usuarios.* from ". $tablas ." where (usuarios.tipo = 'candidato')";		
+		if (($tipoPedidos != "") && ($tipoPedidos != 0))
+			$query = $query . " and (estado = ". $tipoPedidos .")";		
+		if ($whereCampos != "")		
+			$query = $query . " and (". $whereCampos .")";
+		if ($whereSalario != "")		   
+			$query = $query . " and (". $whereSalario .")";
+		if ($whereIdiomas != "")		   
+			$query = $query . " and (". $whereIdiomas .")";
+		if ($wherePerfilesTec != "")		   
+			$query = $query . " and (". $wherePerfilesTec .")";
+		if ($wherePerfilesFun != "")		   
+			$query = $query . " and (". $wherePerfilesFun .")";
+		if ($whereTecnologias != "")		   
+			$query = $query . " and (". $whereTecnologias .")";
+
+                //Metemos la ordenacion deseada
+                $query = $query. $order_by;
+                //echo $query;
+		$listaCandidatos=new ListaCandidatos($usuario,"",$query,""); 
+	}
+}
+?>
+
+<form name="buscador" method="post" action="buscar_candidato.php"><br>
+<h2><?php echo $locale['820']; ?></h2>
+
+<?php
+if($error!=""){
+	// Mostramos el mensaje
+	echo "<div class=\"aviso error\">".$error."</div>";
+}
+?>
+
+<div class="encabezado"><?php echo $locale['Candidato007']; ?></div>
+<table align="center" width="100%" border="0">
+<tr>
+<td width="12%">
+
+<?php echo $locale['01901'] .'<br><input type="text" name="palabra" value="'. $_POST['palabra'] .'"><br/>
+<p>* Para la búsqueda en los ficheros de currículums, se devolverán como máximo los 100 primeros resultados.</p>
+</td>';
+
+echo '<td width="6%"';
+if (in_array("1",$errores)) echo " class=\"errorcampo\"";
+echo '>'. $locale['01902'];
+?>
+<br><select multiple name="campo[]" id="campo" size="10">
+<?php
+while($row = mysql_fetch_row($resultado)) {
+	if (in_array($row[0], $camposPermitidos)){
+
+		if (in_array($row[0], $_POST['campo']))
+			echo '<option selected ';
+		else
+			echo '<option ';
+		
+		echo 'value="'. $row[0] .'">'. $row[0] .'</option>';
+	}	
+}
+?>
+    <option <?php echo (in_array('cv', $_POST['campo'])) ? "selected" : ""; ?> value="cv"><?php echo $locale['5108']; ?></option>
+</select>
+
+
+</td>
+<td width="11%">
+<?php
+echo $locale['123'].'<br>';
+echo $html->listaSelect("idiomas","oid","id","idiomas",array("",$locale['ns']),$_POST['idiomas'],true,true,"15");
+?>
+<td width="71%"
+<?php
+if (in_array("2",$errores)) echo " class=\"errorcampo\"";
+echo '>';
+
+echo $locale['130busqueda01'];
+$opcionvacia = '<option value="">'.$locale['ns'].'</option>';
+echo rellena_desplegable_select_oidCol("salario","id","nombre","salario_busqueda_min",$opcionvacia,$_POST['salario_busqueda_min']);
+echo $locale['130busqueda02'];
+echo rellena_desplegable_select_oidCol("salario","id","nombre","salario_busqueda_max",$opcionvacia,$_POST['salario_busqueda_max']);
+?>
+<br/><p>* No se tendrá en cuenta candidatos cuyo salario mínimo no sea numérico</p>
+</td>
+</tr></table>
+<input type="submit" value="Buscar" name="buscar">
+<br>
+<div class="encabezado"><?php echo $locale['Capacidades004']; ?></div>
+<table align="center" width="100%" border="0">
+<tr>
+<td width="18%">
+<?php
+echo $locale['202']. "<br>";
+echo $html->listaSelect("perfil","oid","id","id_perfil_tecnico",array("",$locale['ns']),$_POST['id_perfil_tecnico'],true,true,"15");
+?>
+</td>
+<td width="12%">
+<?php
+echo $locale['203'].'<br>';
+echo $html->listaSelect("tecnologia","oid","id","tecnologias",array("",$locale['ns']),$_POST['tecnologias'],true,true,"15");
+?>
+</td>
+<td width="70%">
+<?php
+echo $locale['202_2'].'<br>';
+echo $html->listaSelect("perfil_funcional","oid","id","id_perfil_funcional",array("",$locale['ns']),$_POST['id_perfil_funcional'],true,true,"15");
+?>
+</td>
+</tr>
+</table>
+<input type="submit" value="Buscar" name="buscar">
+</form>
+
+<?php
+include_once("ver_lista_candidatos.php");
+include_once("html/pie.php");
+?>

src/candidaturas.php

@@ -9,7 +9,7 @@ if(!$_SESSION["oid"]){
 
 $consulta = "SELECT U.oid as idCandidato,CP.oid as idOferta, CP.referencia, 
 P.oid as idPedido, U.nombre,U.apellidos,P.nombre AS pedido, CE.nombre AS estado, 
-CP.obsRRHH,CP.obsGerente
+CP.obsRRHH,CP.obsGerente, CP.salario_ofertado
 FROM usuarios U,pedidos P,candidato_pedido CP,candidaturas_estados CE
 WHERE U.oid='".$persona->getValor("oid")."'
 AND CP.candidato=U.oid
@@ -35,11 +35,13 @@ if ($resultado = consultar($consulta)){
                         $oidOferta = $row["idOferta"];
 			$obsRRHH = $row["obsRRHH"];
 			$obsGerente = $row["obsGerente"];
+			$salario_ofertado = $row["salario_ofertado"];
 			$idCandidato = $row["idCandidato"];
 			echo "<li>";
                         echo "Oferta <a href=\"oferta.php?idOferta=".$oidOferta."\" target=\"_blank\" />$referenciaOferta</a> ";
                         echo "($estado) ";
-                        echo "- Solicitud \"<a href=\"pedido.php?idPedido=".$oid."\" target=\"_blank\" />$pedido</a>\"</li>";
+                        echo "- Solicitud \"<a href=\"pedido.php?idPedido=".$oid."\" target=\"_blank\" />$pedido</a>";
+                        echo " - Salario ofertado: ". $salario_ofertado. "</li>";
 			
                         // desactivar el comentario por ahora
                         if (false) { //if($usuario->tieneRol("4")){

src/consulta_solr.php

@@ -0,0 +1,97 @@
+<?php
+
+// make sure browsers see this page as utf-8 encoded HTML
+header('Content-Type: text/html; charset=utf-8');
+
+$limit = 10;
+$query = isset($_REQUEST['q']) ? $_REQUEST['q'] : false;
+$results = false;
+
+if ($query)
+{
+  // The Apache Solr Client library should be on the include path
+  // which is usually most easily accomplished by placing in the
+  // same directory as this script ( . or current directory is a default
+  // php include path entry in the php.ini)
+  require_once('vendor/SolrPhpClient/Apache/Solr/Service.php');
+
+  // create a new solr service instance - host, port, and webapp
+  // path (all defaults in this example)
+  $solr = new Apache_Solr_Service('localhost', 8983, '/solr/');  
+
+  // if magic quotes is enabled then stripslashes will be needed
+  if (get_magic_quotes_gpc() == 1)
+  {
+    $query = stripslashes($query);
+  }
+  
+  
+  // in production code you'll always want to use a try /catch for any
+  // possible exceptions emitted  by searching (i.e. connection
+  // problems or a query parsing error)
+  try
+  {
+        $query_content = 'attr_content:'.$query;
+        $results = $solr->search($query_content, 0, $limit);
+  }
+  catch (Exception $e)
+  {
+    // in production you'd probably log or email this error to an admin
+        // and then show a special message to the user but for this example
+        // we're going to show the full exception
+        die("<html><head><title>SEARCH EXCEPTION</title><body><pre>{$e->__toString()}</pre></body></html>");
+  }
+}
+
+?>
+<html>
+  <head>
+    <title>PHP Solr Client Example</title>
+  </head>
+  <body>
+    <form  accept-charset="utf-8" method="get">
+      <label for="q">Search:</label>
+      <input id="q" name="q" type="text" value="<?php echo htmlspecialchars($query, ENT_QUOTES, 'utf-8'); ?>"/>
+      <input type="submit"/>
+    </form>
+<?php
+
+// display results
+if ($results)
+{
+  $total = (int) $results->response->numFound;
+  $start = min(1, $total);
+  $end = min($limit, $total);
+?>
+    <div>Results <?php echo $start; ?> - <?php echo $end;?> of <?php echo $total; ?>:</div>
+    <ol>
+<?php
+  // iterate result documents
+  foreach ($results->response->docs as $doc)
+  {
+?>
+      <li>
+        <table style="border: 1px solid black; text-align: left">
+<?php
+    // iterate document fields / values
+    foreach ($doc as $field => $value)
+    {
+?>
+          <tr>
+            <th><?php echo htmlspecialchars($field, ENT_NOQUOTES, 'utf-8'); ?></th>
+            <td><?php echo htmlspecialchars($value, ENT_NOQUOTES, 'utf-8'); ?></td>
+          </tr>
+<?php
+    }
+?>
+        </table>
+      </li>
+<?php
+  }
+?>
+    </ol>
+<?php
+}
+?>
+  </body>
+</html>