Changeset 8127
- Timestamp:
- Sep 26, 2018, 12:05:35 PM (2 years ago)
- Location:
- pmb5.0/trunk/fuentes/pmb
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
pmb5.0/trunk/fuentes/pmb/admin/misc/setup_initialization.inc.php
r6883 r8127 176 176 pmb_init_indexation_records(); 177 177 178 //---------------------LLIUREX 26/09/2018--------- 178 179 // Readers encoding passwords 179 pmb_init_hash_passwords(); 180 //pmb_init_hash_passwords(); 181 //--------------------- FIN LLIUREX 26/09/2018-------- 180 182 181 183 pmb_mysql_query("update parametres set valeur_param='0' where type_param='pmb' and sstype_param='indexation_must_be_initialized'", $dbh); -
pmb5.0/trunk/fuentes/pmb/copia_seg_importa.php
r6976 r8127 68 68 $version_pmb_bdd = $data['valeur_param']; 69 69 echo " versió: ".$version_pmb_bdd; 70 71 $query="select valeur_param from parametres where type param='pmb' and sstype_param ='indexation_must_be_initialized'"; 72 $result = pmb_mysql_query($query, $dbh); 73 if (pmb_mysql_num_rows($result)) { 74 $query="update parametres set valeur_param=-1 where type param='pmb' and sstype_param ='indexation_must_be_initialized'"; 75 $res = mysql_query($rqt, $dbh); 76 }else{ 77 $query="INSERT INTO parametres (type_param, sstype_param, valeur_param, comment_param, section_param, gestion) VALUES ('pmb','indexation_must_be_initialized','-1','Indexation required','',0)"; 78 $res = mysql_query($query, $dbh); 79 } 80 81 70 82 //--------------------------------- LLIUREX 06/04/2016----------------- 71 83 switch ($version_pmb_bdd){ -
pmb5.0/trunk/fuentes/pmb/includes/messages/es_ES.xml
r7107 r8127 10056 10056 <!--FIN LLIUREX 07/03/2018--> 10057 10057 10058 <!-- LLIUREX 26/09/2018 --> 10059 <entry code="indexation_alert">El proceso de indexación de la base de datos se ejecutará a continuación. Este proceso puede tardar varios minutos</entry> 10060 <entry code="indexation_init">Preparando el proceso de indexación de la base de datos. Espere un momento por favor ...</entry> 10061 <entry code="minor_changes_bbdd">Aplicando cambios menores y reindexando la base de datos...</entry> 10062 <entry code="minor_changes_end">Cambios menores aplicados en la base de datos.</entry> 10063 <entry code="indexation_progress">Reindexando la base de datos...</entry> 10064 <entry code="indexation_end">La reindexación de la base de datos ha finalizado</entry> 10065 10066 <!-- FIN LLIUREX 26/09/2018 --> 10067 10058 10068 </XMLlist> -
pmb5.0/trunk/fuentes/pmb/includes/messages/va_ES.xml
r7278 r8127 7729 7729 <entry code="porcentaje_tejuelo">Percentatge d'escala del teixell en l'etiqueta: </entry> 7730 7730 <!--FIN LLIUREX 07/03/2018--> 7731 7732 <!-- LLIUREX 26/09/2018 --> 7733 <entry code="indexation_alert">El proceso de indexación de la base de datos se ejecutará a continuación. Este proceso puede tardar varios minutos</entry> 7734 <entry code="indexation_init">Preparando el proceso de indexación de la base de datos. Espere un momento por favor ...</entry> 7735 <entry code="minor_changes_bbdd">Aplicando cambios menores y reindexando la base de datos...</entry> 7736 <entry code="minor_changes_end">Cambios menores aplicados en la base de datos.</entry> 7737 <entry code="indexation_progress">Reindexando la base de datos...</entry> 7738 <entry code="indexation_end">La reindexación de la base de datos ha finalizado</entry> 7739 7740 <!-- FIN LLIUREX 26/09/2018 --> 7741 7731 7742 </XMLlist> -
pmb5.0/trunk/fuentes/pmb/main.php
r6915 r8127 17 17 $base_nocheck=1; 18 18 require_once ("$base_path/includes/init.inc.php"); 19 20 //-----------------------------------LLIUREX 26/09/2018------------------------ 21 22 function show_loader(){ 23 header("Content-type: text/css"); 24 echo "<style> 25 .lds-ellipsis { 26 display: inline-block; 27 position: relative; 28 width: 64px; 29 height: 64px; 30 } 31 .lds-ellipsis div { 32 position: absolute; 33 top: 27px; 34 width: 11px; 35 height: 11px; 36 border-radius: 50%; 37 background: #3d474c; 38 animation-timing-function: cubic-bezier(0, 1, 1, 0); 39 } 40 .lds-ellipsis div:nth-child(1) { 41 left: 6px; 42 animation: lds-ellipsis1 0.6s infinite; 43 } 44 .lds-ellipsis div:nth-child(2) { 45 left: 6px; 46 animation: lds-ellipsis2 0.6s infinite; 47 } 48 .lds-ellipsis div:nth-child(3) { 49 left: 26px; 50 animation: lds-ellipsis2 0.6s infinite; 51 } 52 .lds-ellipsis div:nth-child(4) { 53 left: 45px; 54 animation: lds-ellipsis3 0.6s infinite; 55 } 56 @keyframes lds-ellipsis1 { 57 0% { 58 transform: scale(0); 59 } 60 100% { 61 transform: scale(1); 62 } 63 } 64 @keyframes lds-ellipsis3 { 65 0% { 66 transform: scale(1); 67 } 68 100% { 69 transform: scale(0); 70 } 71 } 72 @keyframes lds-ellipsis2 { 73 0% { 74 transform: translate(0, 0); 75 } 76 100% { 77 transform: translate(19px, 0); 78 } 79 } 80 </style>"; 81 echo "<div id='loader' align='center'><div class='lds-ellipsis''><div></div><div></div><div></div><div></div></div></div>"; 82 83 } 84 85 function indexation_required($msg,$bdd_info){ 86 87 $query="SELECT * FROM pmb.parametres where type_param='pmb' and sstype_param ='indexation_must_be_initialized' and valeur_param='-1'"; 88 89 $result = pmb_mysql_query($query, $dbh); 90 91 if (pmb_mysql_num_rows($result)) { 92 $required_indexation=-1; 93 if (($bdd_info[0]==$bdd_info[1]) and ($bdd_info[2]==$bdd_info[3])){ 94 echo "<SCRIPT>alert(\"".$msg["indexation_alert"]."\");</SCRIPT>"; 95 echo "<div id='llxwaiting'><br><h1>".$msg["indexation_init"]."</h1></br></div>"; 96 show_loader(); 97 } 98 }else{ 99 $required_indexation=0; 100 } 101 return $required_indexation; 102 } 103 104 105 //-------------------------------- FIN LLIUREX 26/09/2018------------------------ 106 19 107 20 108 //Est-on déjà authentifié ? … … 52 140 } 53 141 142 54 143 // localisation (fichier XML) 55 144 $messages = new XMLlist("$include_path/messages/$lang.xml", 0); … … 59 148 header ("Content-Type: text/html; charset=$charset"); 60 149 150 require_once("$include_path/templates/main.tpl.php"); 151 152 print $std_header; 153 print "<body class='$current_module claro' id='body_current_module' page_name='$current_module'>"; 154 print $menu_bar; 155 156 print $extra; 157 158 159 160 if($use_shortcuts) { 161 include("$include_path/shortcuts/circ.sht"); 162 } 163 print $main_layout; 164 165 //-----------------------------------LLIUREX 26/09/2018------------------------ 166 167 $bdd_info=Array($pmb_bdd_version,$pmb_version_database_as_it_should_be,$pmb_subversion_database_as_it_shouldbe,$pmb_bdd_subversion); 168 $required_indexation=indexation_required($msg,$bdd_info); 169 170 //------------------------------- FIN LLIUREX 26/09/2018------------------------ 171 172 61 173 if ((!$param_licence)||($pmb_bdd_version!=$pmb_version_database_as_it_should_be)||($pmb_subversion_database_as_it_shouldbe!=$pmb_bdd_subversion)) { 62 require_once("$include_path/templates/main.tpl.php"); 63 print $std_header; 64 print "<body class='$current_module claro' id='body_current_module' page_name='$current_module'>"; 65 print $menu_bar; 66 67 print $extra; 68 if($use_shortcuts) { 69 include("$include_path/shortcuts/circ.sht"); 70 } 71 print $main_layout; 72 174 175 //-----------------------------------LLIUREX 26/09/2018------------------------ 176 177 /*require_once("$include_path/templates/main.tpl.php"); 178 //print $std_header; 179 //print "<body class='$current_module claro' id='body_current_module' page_name='$current_module'>"; 180 //print $menu_bar; 181 182 //print $extra; 183 //if($use_shortcuts) { 184 // include("$include_path/shortcuts/circ.sht"); 185 //} 186 print $main_layout;*/ 187 188 //------------------------------- FIN LLIUREX 26/09/2018------------------------ 189 190 73 191 if ($pmb_bdd_version!=$pmb_version_database_as_it_should_be) { 192 //-----------------------------------LLIUREX 26/09/2018------------------------ 193 $required_indexation=0; 194 //-------------------------------- FIN LLIUREX 26/09/2018------------------------ 195 74 196 echo "<h1>".$msg["pmb_v_db_pas_a_jour"]."</h1>"; 75 197 echo "<h1>".$msg[1803]."<font color=red>".$pmb_bdd_version."</font></h1>"; … … 77 199 echo "<a href='./admin.php?categ=alter&sub='>".$msg["pmb_v_db_mettre_a_jour"]."</a>"; 78 200 echo "<SCRIPT>alert(\"".$msg["pmb_v_db_pas_a_jour"]."\\n".$pmb_version_database_as_it_should_be." <> ".$pmb_bdd_version."\");</SCRIPT>"; 201 79 202 } elseif ($pmb_subversion_database_as_it_shouldbe!=$pmb_bdd_subversion) { 80 echo "<h1>Minor changes in database in progress...</h1>"; 203 204 //-----------------------------------LLIUREX 26/09/2018------------------------ 205 206 echo "<h1>".$msg["minor_changes_bbdd"]."</h1>"; 207 show_loader(); 81 208 include("./admin/misc/addon.inc.php"); 82 echo "<h1>Changes applied in database.</h1>"; 209 echo "<h1>".$msg["minor_changes_end"]."</h1>"; 210 echo "<h1>".$msg["indexation_alert"]."</h1>"; 211 $required_indexation=-1; 83 212 } 84 213 85 214 //On est probablement sur une première connexion à PMB 86 $pmb_indexation_must_be_initialized += 0; 87 if($pmb_indexation_must_be_initialized) { 88 echo "<h1>Indexation in progress...</h1>"; 215 #$pmb_indexation_must_be_initialized -= 1; 216 217 if($required_indexation) { 218 219 echo "<h1>".$msg["indexation_progress"]."</h1>"; 89 220 flush(); 90 221 ob_flush(); 91 222 include("./admin/misc/setup_initialization.inc.php"); 92 echo "<h1>Indexation applied in database.</h1>"; 93 } 94 223 echo "<h1>".$msg["indexation_end"]."</h1>"; 224 echo "<script>document.querySelector('#loader').remove();</script>"; 225 226 } 227 228 //---------------------------FIN LLIUREX 26/09/2018------------------------ 229 230 95 231 if (!$param_licence) { 96 232 include("$base_path/resume_licence.inc.php"); … … 100 236 print $main_layout_end; 101 237 print $footer; 102 103 238 pmb_mysql_close($dbh); 104 239 exit ; 105 } 240 241 //-----------------------------------LLIUREX 26/09/2018------------------------ 242 243 }elseif($required_indexation){ 244 echo "<script>document.querySelector('#llxwaiting').remove();</script>"; 245 echo "<script>document.querySelector('#loader').remove();</script>"; 246 echo "<h1>".$msg["indexation_progress"]."</h1>"; 247 show_loader(); 248 flush(); 249 ob_flush(); 250 include("./admin/misc/setup_initialization.inc.php"); 251 echo "<h1>".$msg["indexation_end"]."</h1>"; 252 echo "<script>document.querySelector('#loader').remove();</script>"; 253 print $main_layout_end; 254 print $footer; 255 pmb_mysql_close($dbh); 256 exit ; 257 } 258 259 //---------------------------- FIN LLIUREX 26/09/2018------------------------ 260 261 106 262 if ($ret_url) { 107 263 if(strpos($ret_url, 'ajax.php') !== false) {
Note: See TracChangeset
for help on using the changeset viewer.