Applying changeset r4112 to trunk + adding a second script for adding phpmyadmin user for the upgrades that failed to add it.

This commit is contained in:
Steven Mondji-Lerider 2013-02-25 08:59:48 +00:00
parent 7d4ad2244a
commit 70bf73c154
3 changed files with 49 additions and 7 deletions

1
.gitattributes vendored
View File

@ -523,6 +523,7 @@ install/upgrades/3.0.0~3.php -text
install/upgrades/3.0.0~4.sh -text install/upgrades/3.0.0~4.sh -text
install/upgrades/3.1.0~a.sql -text install/upgrades/3.1.0~a.sql -text
install/upgrades/3.1.0~b.php -text install/upgrades/3.1.0~b.php -text
install/upgrades/3.1.0~c.php -text
install/upgrades/README -text install/upgrades/README -text
lang/.svnignore -text lang/.svnignore -text
lang/README -text lang/README -text

View File

@ -1,17 +1,20 @@
#!/usr/bin/php #!/usr/bin/php
<?php <?php
// We check that mysql php module is loaded // We check that mysql php module is loaded
if(!function_exists('mysql_connect')) { if(!function_exists('mysql_connect')) {
if(!dl("mysql.so")) if(!dl("mysql.so"))
exit(1); exit(1);
} }
// we don't check our AlternC session // we don't check our AlternC session
if(!chdir("/var/alternc/bureau")) if(!chdir("/var/alternc/bureau"))
exit(1); exit(1);
require("/var/alternc/bureau/class/config_nochk.php"); require("/var/alternc/bureau/class/config_nochk.php");
$db2=new DB_System();
// we go super-admin // we go super-admin
$admin->enabled=1; $admin->enabled=1;
@ -37,11 +40,14 @@ $db->query("select distinct uid,login,pass from db;");
//on insere dans dbusers avec enabled = admin //on insere dans dbusers avec enabled = admin
$query=array(); $query=array();
while($db->next_record()){ while($db->next_record()){
$query[]="insert into dbusers values('',".$db->f('uid').",'".$db->f('login')."','".$db->f('pass')."',\"ADMIN\");"; $db2->query("select id from dbusers where name ='".$db->f('login')."' and password='".$db->f('pass')."';");
if($db2->num_rows() ==0 ){
$query[]="insert ignore into dbusers values('',".$db->f('uid').",'".$db->f('login')."','".$db->f('pass')."',\"ADMIN\");";
}
} }
foreach ($query as $q){ foreach ($query as $q){
print_r($q); $db->query($q);
$db->query($q);
} }
//Updating mysql.db table to fix the "_" wildcard bug //Updating mysql.db table to fix the "_" wildcard bug
@ -54,7 +60,7 @@ while($db->next_record()){
} }
foreach ($query2 as $q2){ foreach ($query2 as $q2){
$db->query($q2); $db->query($q2);
} }
?>
//done ? :) //done ? :)

View File

@ -0,0 +1,35 @@
#!/usr/bin/php
<?php
// We check that mysql php module is loaded
if(!function_exists('mysql_connect')) {
if(!dl("mysql.so"))
exit(1);
}
// we don't check our AlternC session
if(!chdir("/var/alternc/bureau"))
exit(1);
require("/var/alternc/bureau/class/config_nochk.php");
$db2=new DB_System();
// we go super-admin
$admin->enabled=1;
$db->query("select distinct uid,login,pass from db;");
//on insere dans dbusers avec enabled = admin
$query=array();
while($db->next_record()){
$db2->query("select id from dbusers where name ='".$db->f('login')."' and password='".$db->f('pass')."';");
if($db2->num_rows() ==0 ){
$query[]="insert ignore into dbusers values('',".$db->f('uid').",'".$db->f('login')."','".$db->f('pass')."',\"ADMIN\");";
}
}
foreach ($query as $q){
$db->query($q);
}
?>
//done ? :)