Merge remote-tracking branch 'koumbit/stable-3.1' into pu
This commit is contained in:
		
						commit
						325b913e24
					
				|  | @ -33,13 +33,13 @@ while (list($key,$val)=each($_POST)) { | |||
|     $r=$aws->delete_stats($val); | ||||
|     $found=true; | ||||
|     if ($r) { | ||||
|       $msg->raise('Ok', "aws", _("The statistics %s has been successfully deleted"),$r); | ||||
|       $msg->raise('INFO', "aws", _("The statistics %s has been successfully deleted"),$r); | ||||
|     } | ||||
|   } | ||||
| } | ||||
| 
 | ||||
| if (!$found) { | ||||
|   $msg->raise('Info', "aws", _("Please check the statistics set you want to delete")); | ||||
|   $msg->raise('INFO', "aws", _("Please check the statistics set you want to delete")); | ||||
|  } | ||||
| 
 | ||||
| include("aws_list.php"); | ||||
|  |  | |||
|  | @ -45,7 +45,7 @@ if ($confirm == 1) { | |||
| 	$msg->raise('Error', "aws", _("Passwords do not match")); | ||||
|     } else { | ||||
| 	if ($aws->change_pass($login,$pass)) { | ||||
| 		$msg->raise('Ok', "aws", _("Password successfuly updated")); | ||||
| 		$msg->raise('INFO', "aws", _("Password successfuly updated")); | ||||
| 		include("aws_users.php"); | ||||
| 		exit(); | ||||
| 	} | ||||
|  |  | |||
|  | @ -38,7 +38,7 @@ if ($pass != $passconf) { | |||
| 	$r=$aws->add_login($prefixe.(($login)?"_":"").$login,$pass); | ||||
| 
 | ||||
| 	if ($r) { | ||||
| 		$msg->raise('Ok', "aws", _("The Awstat account has been successfully created")); | ||||
| 		$msg->raise('INFO', "aws", _("The Awstat account has been successfully created")); | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -31,7 +31,7 @@ while (list($key,$val)=each($_POST)) { | |||
| 		// Effacement du compte ftp $val
 | ||||
| 		$r=$aws->del_login($val); | ||||
| 		if ($r) { | ||||
| 			$msg->raise('Ok', "aws", _("The awstat account %s has been successfully deleted"),$val); | ||||
| 			$msg->raise('INFO', "aws", _("The awstat account %s has been successfully deleted"),$val); | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
|  |  | |||
|  | @ -952,7 +952,7 @@ class m_mysql { | |||
|         global $db, $msg, $cuid, $mem; | ||||
|         $msg->log("mysql", "alternc_add_member"); | ||||
|         // checking for the phpmyadmin user
 | ||||
|         $db->query("SELECT name,password FROM dbusers WHERE uid= ? AND Type='ADMIN';", array($cuid)); | ||||
|         $db->query("SELECT name,password FROM dbusers WHERE uid= ? AND enable='ADMIN';", array($cuid)); | ||||
|         if ($db->num_rows()) { | ||||
|             $myadm = $db->f("name"); | ||||
|             $password = $db->f("password"); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue