From c988f54df5c74e02dba05e31b91154a365dcb8ae Mon Sep 17 00:00:00 2001
From: ahollosi <ahollosi@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 13 Nov 2000 14:54:08 +0000
Subject: [PATCH] added config options for all mysql table names

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@335 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/config.php |  5 ++++-
 lib/mysql.php  | 51 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/lib/config.php b/lib/config.php
index a6d642949..81d635840 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -6,7 +6,7 @@
    if (!function_exists('rcs_id')) {
       function rcs_id($id) { echo "<!-- $id -->\n"; };
    }
-   rcs_id('$Id: config.php,v 1.15 2000-11-08 15:40:00 ahollosi Exp $');
+   rcs_id('$Id: config.php,v 1.16 2000-11-13 14:54:08 ahollosi Exp $');
    // end essential internal stuff
 
 
@@ -50,6 +50,9 @@
    } elseif ($WhichDatabase == 'mysql') {
       $WikiPageStore = "wiki";
       $ArchivePageStore = "archive";
+      $WikiLinksStore = "wikilinks";
+      $WikiScoreStore = "wikiscore";
+      $HitCountStore = "hitcount";
       $mysql_server = 'localhost';
       $mysql_user = 'root';
       $mysql_pwd = '';
diff --git a/lib/mysql.php b/lib/mysql.php
index 2494e1742..300639a39 100644
--- a/lib/mysql.php
+++ b/lib/mysql.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: mysql.php,v 1.5 2000-11-09 02:57:51 wainstead Exp $');
+<?php rcs_id('$Id: mysql.php,v 1.6 2000-11-13 14:54:08 ahollosi Exp $');
 
    /*
       Database functions:
@@ -148,7 +148,8 @@
 
 
    function RemovePage($dbi, $pagename) {
-      global $WikiPageStore, $ArchivePageStore;
+      global $WikiPageStore, $ArchivePageStore
+      global $WikiLinksStore, $HitCountStore, $WikiScoreStore;
 
       $pagename = addslashes($pagename);
       $msg = gettext ("Cannot delete '%s' from table '%s'");
@@ -161,23 +162,25 @@
       if (!mysql_query("delete from $ArchivePageStore where pagename='$pagename'", $dbi['dbc']))
          ExitWiki(sprintf($msg, $pagename, $ArchivePageStore, mysql_error()));
 
-      if (!mysql_query("delete from wikilinks where frompage='$pagename'", $dbi['dbc']))
-         ExitWiki(sprintf($msg, $pagename, 'wikilinks', mysql_error()));
+      if (!mysql_query("delete from $WikiLinksStore where frompage='$pagename'", $dbi['dbc']))
+         ExitWiki(sprintf($msg, $pagename, $WikiLinksStore, mysql_error()));
 
-      if (!mysql_query("delete from hitcount where pagename='$pagename'", $dbi['dbc']))
-         ExitWiki(sprintf($msg, $pagename, 'hitcount', mysql_error()));
+      if (!mysql_query("delete from $HitCountStore where pagename='$pagename'", $dbi['dbc']))
+         ExitWiki(sprintf($msg, $pagename, $HitCountStore, mysql_error()));
 
-      if (!mysql_query("delete from wikiscore where pagename='$pagename'", $dbi['dbc']))
-         ExitWiki(sprintf($msg, $pagename, 'wikiscore', mysql_error()));
+      if (!mysql_query("delete from $WikiScoreStore where pagename='$pagename'", $dbi['dbc']))
+         ExitWiki(sprintf($msg, $pagename, $WikiScoreStore, mysql_error()));
    }
 
 
    function IncreaseHitCount($dbi, $pagename)
    {
-      $res = mysql_query("update hitcount set hits=hits+1 where pagename='$pagename'", $dbi['dbc']);
+      global $HitCountStore;
+
+      $res = mysql_query("update $HitCountStore set hits=hits+1 where pagename='$pagename'", $dbi['dbc']);
 
       if (!mysql_affected_rows($dbi['dbc'])) {
-	 $res = mysql_query("insert into hitcount (pagename, hits) values ('$pagename', 1)", $dbi['dbc']);
+	 $res = mysql_query("insert into $HitCountStore (pagename, hits) values ('$pagename', 1)", $dbi['dbc']);
       }
 
       return $res;
@@ -185,7 +188,9 @@
 
    function GetHitCount($dbi, $pagename)
    {
-      $res = mysql_query("select hits from hitcount where pagename='$pagename'", $dbi['dbc']);
+      global $HitCountStore;
+
+      $res = mysql_query("select hits from $HitCountStore where pagename='$pagename'", $dbi['dbc']);
       if (mysql_num_rows($res))
          $hits = mysql_result($res, 0);
       else
@@ -234,7 +239,8 @@
    }
 
    function InitMostPopular($dbi, $limit) {
-      $res = mysql_query("select * from hitcount order by hits desc, pagename limit $limit", $dbi["dbc"]);
+      global $HitCountStore;
+      $res = mysql_query("select * from $HitCountStore order by hits desc, pagename limit $limit", $dbi["dbc"]);
       
       return $res;
    }
@@ -247,7 +253,8 @@
    }
 
    function GetAllWikiPageNames($dbi) {
-      $res = mysql_query("select pagename from wiki", $dbi["dbc"]);
+      global $WikiPageStore;
+      $res = mysql_query("select pagename from $WikiPageStore", $dbi["dbc"]);
       $rows = mysql_num_rows($res);
       for ($i = 0; $i < $rows; $i++) {
 	 $pages[$i] = mysql_result($res, $i);
@@ -261,22 +268,24 @@
 
    // takes a page name, returns array of scored incoming and outgoing links
    function GetWikiPageLinks($dbi, $pagename) {
+      global $WikiLinksStore, $WikiScoreStore, $HitCountStore;
+
       $pagename = addslashes($pagename);
-      $res = mysql_query("select topage, score from wikilinks, wikiscore where topage=pagename and frompage='$pagename' order by score desc, topage");
+      $res = mysql_query("select topage, score from $WikiLinksStore, $WikiScoreStore where topage=pagename and frompage='$pagename' order by score desc, topage");
       $rows = mysql_num_rows($res);
       for ($i = 0; $i < $rows; $i++) {
 	 $out = mysql_fetch_array($res);
 	 $links['out'][] = array($out['topage'], $out['score']);
       }
 
-      $res = mysql_query("select frompage, score from wikilinks, wikiscore where frompage=pagename and topage='$pagename' order by score desc, frompage");
+      $res = mysql_query("select frompage, score from $WikiLinksStore, $WikiScoreStore where frompage=pagename and topage='$pagename' order by score desc, frompage");
       $rows = mysql_num_rows($res);
       for ($i = 0; $i < $rows; $i++) {
 	 $out = mysql_fetch_array($res);
 	 $links['in'][] = array($out['frompage'], $out['score']);
       }
 
-      $res = mysql_query("select distinct pagename, hits from wikilinks, hitcount where (frompage=pagename and topage='$pagename') or (topage=pagename and frompage='$pagename') order by hits desc, pagename");
+      $res = mysql_query("select distinct pagename, hits from $WikiLinksStore, $HitCountStore where (frompage=pagename and topage='$pagename') or (topage=pagename and frompage='$pagename') order by hits desc, pagename");
       $rows = mysql_num_rows($res);
       for ($i = 0; $i < $rows; $i++) {
 	 $out = mysql_fetch_array($res);
@@ -290,10 +299,12 @@
    // takes page name, list of links it contains
    // the $linklist is an array where the keys are the page names
    function SetWikiPageLinks($dbi, $pagename, $linklist) {
+      global $WikiLinksStore, $WikiScoreStore;
+
       $frompage = addslashes($pagename);
 
       // first delete the old list of links
-      mysql_query("delete from wikilinks where frompage='$frompage'",
+      mysql_query("delete from $WikiLinksStore where frompage='$frompage'",
 		$dbi["dbc"]);
 
       // the page may not have links, return if not
@@ -303,14 +314,14 @@
       while (list($topage, $count) = each($linklist)) {
          $topage = addslashes($topage);
 	 if($topage != $frompage) {
-            mysql_query("insert into wikilinks (frompage, topage) " .
+            mysql_query("insert into $WikiLinksStore (frompage, topage) " .
                      "values ('$frompage', '$topage')", $dbi["dbc"]);
 	 }
       }
 
       // update pagescore
-      mysql_query("delete from wikiscore", $dbi["dbc"]);
-      mysql_query("insert into wikiscore select w1.topage, count(*) from wikilinks as w1, wikilinks as w2 where w2.topage=w1.frompage group by w1.topage", $dbi["dbc"]);
+      mysql_query("delete from $WikiScoreStore", $dbi["dbc"]);
+      mysql_query("insert into $WikiScoreStore select w1.topage, count(*) from $WikiLinksStore as w1, $WikiLinksStore as w2 where w2.topage=w1.frompage group by w1.topage", $dbi["dbc"]);
    }
 
 /* more mysql queries:
-- 
2.45.0