Mibew/i18n
1
0
Fork 0
mirror of https://github.com/Mibew/i18n.git synced 2025-02-08 20:01:07 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix minor issues (link param, formatting)

Browse Source
This commit is contained in:
Evgeny Gryaznov 2011-02-26 23:54:58 +01:00
parent 03dec2afb2
commit f4e99a3d52
6 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/messenger/webim/install/dbinfo.php
View File

@ -155,7 +155,7 @@ function create_table($id, $link)
global $dbtables, $memtables, $dbencoding, $mysqlprefix; global $dbtables, $memtables, $dbencoding, $mysqlprefix;
if (!isset($dbtables[$id])) { if (!isset($dbtables[$id])) {
show_install_err("Unknown table: $id, " . mysql_error()); show_install_err("Unknown table: $id, " . mysql_error($link));
} }
$query = $query =
@ -173,7 +173,7 @@ function create_table($id, $link)
$query .= " TYPE=InnoDb"; $query .= " TYPE=InnoDb";
} }
mysql_query($query, $link) or show_install_err(' Query failed: ' . mysql_error()); mysql_query($query, $link) or show_install_err(' Query failed: ' . mysql_error($link));
if ($id == "${mysqlprefix}chatoperator") { if ($id == "${mysqlprefix}chatoperator") {
create_operator_("admin", "", "", "", "Administrator", "Administrator", 0, $link); create_operator_("admin", "", "", "", "Administrator", "Administrator", 0, $link);
@ -185,7 +185,7 @@ function create_table($id, $link)
function get_tables($link) function get_tables($link)
{ {
global $mysqldb, $errors; global $mysqldb, $errors;
$result = mysql_query("SHOW TABLES FROM `$mysqldb`"); $result = mysql_query("SHOW TABLES FROM `$mysqldb`", $link);
if ($result) { if ($result) {
$arr = array(); $arr = array();
while ($row = mysql_fetch_array($result, MYSQL_NUM)) { while ($row = mysql_fetch_array($result, MYSQL_NUM)) {
@ -195,7 +195,7 @@ function get_tables($link)
return $arr; return $arr;
} else { } else {
$errors[] = "Cannot get tables from database. Error: " . mysql_error(); $errors[] = "Cannot get tables from database. Error: " . mysql_error($link);
return false; return false;
} }
} }
@ -203,7 +203,7 @@ function get_tables($link)
function get_columns($tablename, $link) function get_columns($tablename, $link)
{ {
global $errors; global $errors;
$result = mysql_query("SHOW COLUMNS FROM $tablename"); $result = mysql_query("SHOW COLUMNS FROM $tablename", $link);
if ($result) { if ($result) {
$arr = array(); $arr = array();
while ($row = mysql_fetch_array($result, MYSQL_NUM)) { while ($row = mysql_fetch_array($result, MYSQL_NUM)) {
@ -213,7 +213,7 @@ function get_columns($tablename, $link)
return $arr; return $arr;
} else { } else {
$errors[] = "Cannot get columns from table \"$tablename\". Error: " . mysql_error(); $errors[] = "Cannot get columns from table \"$tablename\". Error: " . mysql_error($link);
return false; return false;
} }
} }

12
src/messenger/webim/install/dbperform.php
View File

@ -25,8 +25,7 @@ require_once('dbinfo.php');
function runsql($query, $link) function runsql($query, $link)
{ {
$res = mysql_query($query, $link) $res = mysql_query($query, $link) or show_install_err(' Query failed: ' . mysql_error($link));
or show_install_err(' Query failed: ' . mysql_error());
return $res; return $res;
} }
@ -36,14 +35,12 @@ $link = @mysql_connect($mysqlhost, $mysqllogin, $mysqlpass)
or show_install_err('Could not connect: ' . mysql_error()); or show_install_err('Could not connect: ' . mysql_error());
if ($act == "silentcreateall") { if ($act == "silentcreateall") {
mysql_query("CREATE DATABASE $mysqldb", $link) mysql_query("CREATE DATABASE $mysqldb", $link) or show_install_err(' Query failed: ' . mysql_error($link));
or show_install_err(' Query failed: ' . mysql_error());
foreach ($dbtables as $id) { foreach ($dbtables as $id) {
create_table($id, $link); create_table($id, $link);
} }
} else if ($act == "createdb") { } else if ($act == "createdb") {
mysql_query("CREATE DATABASE $mysqldb", $link) mysql_query("CREATE DATABASE $mysqldb", $link) or show_install_err(' Query failed: ' . mysql_error($link));
or show_install_err(' Query failed: ' . mysql_error());
} else { } else {
mysql_select_db($mysqldb, $link) mysql_select_db($mysqldb, $link)
or show_install_err('Could not select database'); or show_install_err('Could not select database');
@ -62,8 +59,7 @@ if ($act == "silentcreateall") {
} }
} else if ($act == "dt") { } else if ($act == "dt") {
foreach (array_keys($dbtables) as $id) { foreach (array_keys($dbtables) as $id) {
mysql_query("DROP TABLE IF EXISTS $id", $link) mysql_query("DROP TABLE IF EXISTS $id", $link) or show_install_err(' Query failed: ' . mysql_error($link));
or show_install_err(' Query failed: ' . mysql_error());
} }
} else if ($act == "addcolumns") { } else if ($act == "addcolumns") {
$absent = array(); $absent = array();

2
src/messenger/webim/install/index.php
View File

@ -63,7 +63,7 @@ function check_connection()
$page['done'][] = getlocal2("install.1.connected", array($ver['c'])); $page['done'][] = getlocal2("install.1.connected", array($ver['c']));
mysql_free_result($result); mysql_free_result($result);
} else { } else {
$errors[] = "Version of your SQL server is unknown. Please check. Error: " . mysql_error(); $errors[] = "Version of your SQL server is unknown. Please check. Error: " . mysql_error($link);
mysql_close($link); mysql_close($link);
return null; return null;
} }

11
src/messenger/webim/libs/common.php
View File

@ -359,14 +359,12 @@ function connect()
function perform_query($query, $link) function perform_query($query, $link)
{ {
mysql_query($query, $link) mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link) /*.": ".$query*/);
or die(' Query failed: ' . mysql_error() /*.": ".$query*/);
} }
function select_one_row($query, $link) function select_one_row($query, $link)
{ {
$result = mysql_query($query, $link) or die(' Query failed: ' . $result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link));
mysql_error() . ": " . $query);
$line = mysql_fetch_array($result, MYSQL_ASSOC); $line = mysql_fetch_array($result, MYSQL_ASSOC);
mysql_free_result($result); mysql_free_result($result);
return $line; return $line;
@ -374,8 +372,7 @@ function select_one_row($query, $link)
function select_multi_assoc($query, $link) function select_multi_assoc($query, $link)
{ {
$sqlresult = mysql_query($query, $link) or die(' Query failed: ' . $sqlresult = mysql_query($query, $link) or die(' Query failed: '.mysql_error($link));
mysql_error() . ": " . $query);
$result = array(); $result = array();
while ($row = mysql_fetch_array($sqlresult, MYSQL_ASSOC)) { while ($row = mysql_fetch_array($sqlresult, MYSQL_ASSOC)) {
@ -395,7 +392,7 @@ function db_build_select($fields, $table, $conditions, $orderandgroup)
function db_rows_count($table, $conditions, $countfields, $link) function db_rows_count($table, $conditions, $countfields, $link)
{ {
$result = mysql_query(db_build_select("count(" . ($countfields ? $countfields : "*") . ")", $table, $conditions, ""), $link) $result = mysql_query(db_build_select("count(" . ($countfields ? $countfields : "*") . ")", $table, $conditions, ""), $link)
or die(' Count query failed: ' . mysql_error()); or die(' Count query failed: ' . mysql_error($link));
$line = mysql_fetch_array($result, MYSQL_NUM); $line = mysql_fetch_array($result, MYSQL_NUM);
mysql_free_result($result); mysql_free_result($result);
return $line[0]; return $line[0];

2
src/messenger/webim/operator/blocked.php
View File

@ -47,7 +47,7 @@ if (isset($_GET['act']) && $_GET['act'] == 'del') {
} }
$result = mysql_query("select banid,unix_timestamp(dtmtill) as till,address,comment from ${mysqlprefix}chatban", $link) $result = mysql_query("select banid,unix_timestamp(dtmtill) as till,address,comment from ${mysqlprefix}chatban", $link)
or die(' Query failed: ' . mysql_error()); or die(' Query failed: ' . mysql_error($link));
$blockedList = array(); $blockedList = array();
while ($ban = mysql_fetch_array($result, MYSQL_ASSOC)) { while ($ban = mysql_fetch_array($result, MYSQL_ASSOC)) {

2
src/messenger/webim/operator/userhistory.php
View File

@ -50,7 +50,7 @@ function threads_by_userid($userid)
"from ${mysqlprefix}chatthread " . "from ${mysqlprefix}chatthread " .
"where userid=\"$userid\" order by created DESC", $userid); "where userid=\"$userid\" order by created DESC", $userid);
$result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error() . ": " . $query); $result = mysql_query($query, $link) or die(' Query failed: ' . mysql_error($link));
$foundThreads = array(); $foundThreads = array();
while ($thread = mysql_fetch_array($result, MYSQL_ASSOC)) { while ($thread = mysql_fetch_array($result, MYSQL_ASSOC)) {