Menu
▾
▴
upcase-project-cvs — Mailig list for CVS commit messages
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(32) |
Sep
|
Oct
|
Nov
(100) |
Dec
(22) |
|---|
|
From: <jhe...@us...> - 2002-11-20 12:16:03
|
Update of /cvsroot/upcase-project/UpCase/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv12546
Modified Files:
menu.php
Log Message:
corected some path and urls
Index: menu.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/menu.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** menu.php 12 Nov 2002 17:46:59 -0000 1.1
--- menu.php 20 Nov 2002 12:15:59 -0000 1.2
***************
*** 12,16 ****
{
$sess->logout();
! header("Location: " . $ucConfig->wwwRoot . "/admin/menu.php?content=main.php");
}
--- 12,16 ----
{
$sess->logout();
! header("Location: " . $ucConfig->upcaseUrl . "/admin/menu.php?content=main.php");
}
***************
*** 42,47 ****
{
$tmpl->MxBloc("login", "modify", "../templates/" . $uc_tmpl['LOGOUT']);
! $tmpl->MxUrl("login.logout", $ucConfig->wwwRoot
! . "/admin/menu.php", array( "logout" => "1"));
$tmpl->MxText("login.username", $user->name);
$tmpl->MxUrl("login.myaccount", "myaccount.php");
--- 42,47 ----
{
$tmpl->MxBloc("login", "modify", "../templates/" . $uc_tmpl['LOGOUT']);
! $tmpl->MxUrl("login.logout", $ucConfig->upcaseUrl . "/admin/menu.php",
! array( "logout" => "1"));
$tmpl->MxText("login.username", $user->name);
$tmpl->MxUrl("login.myaccount", "myaccount.php");
***************
*** 51,58 ****
$tmpl->MxBloc("menu", "append", "../templates/" . $uc_tmpl['APP_MENU']);
! $apps = array( "WebCalendar" => $ucConfig->wwwModules . "/WebCalendar",
! "Owl" => $ucConfig->wwwModules . "/Owl",
! "phpBB" => $ucConfig->wwwModules . "/phpBB2",
! "SPIP" => $ucConfig->wwwModules . "/SPIP");
foreach ($apps as $appName => $appUrl)
--- 51,58 ----
$tmpl->MxBloc("menu", "append", "../templates/" . $uc_tmpl['APP_MENU']);
! $apps = array( "WebCalendar" => $ucConfig->siteUrl . "/WebCalendar",
! "Owl" => $ucConfig->siteUrl . "/Owl",
! "phpBB" => $ucConfig->siteUrl . "/phpBB2",
! "SPIP" => $ucConfig->siteUrl . "/SPIP");
foreach ($apps as $appName => $appUrl)
***************
*** 68,72 ****
$tmpl->MxBloc("menu", "append", "../templates/"
. $uc_tmpl['ADMIN_MENU']);
! $tmpl->MxUrl("menu.packages", "packages.php", "");
$tmpl->MxUrl("menu.accounts", "userslist.php");
$tmpl->MxUrl("menu.permissions", "permissions.php");
--- 68,72 ----
$tmpl->MxBloc("menu", "append", "../templates/"
. $uc_tmpl['ADMIN_MENU']);
! $tmpl->MxUrl("menu.packages", "repository.php", "");
$tmpl->MxUrl("menu.accounts", "userslist.php");
$tmpl->MxUrl("menu.permissions", "permissions.php");
|
|
From: <jhe...@us...> - 2002-11-20 12:15:10
|
Update of /cvsroot/upcase-project/UpCase/templates/en/blocs In directory sc8-pr-cvs1:/tmp/cvs-serv12263/blocs Modified Files: admmenu.mxt Log Message: templates modifications Index: admmenu.mxt =================================================================== RCS file: /cvsroot/upcase-project/UpCase/templates/en/blocs/admmenu.mxt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admmenu.mxt 13 Nov 2002 08:41:32 -0000 1.1 --- admmenu.mxt 20 Nov 2002 12:15:07 -0000 1.2 *************** *** 1,5 **** <h4>Adminstration</h4> <ul> ! <li><a mXattribut="href:packages" target="content">Packages List</a></li> <li><a mXattribut="href:accounts" target="content">Accounts Management</a></li> <li><a mXattribut="href:permissions" target="content">Permissions Management</a></li> --- 1,5 ---- <h4>Adminstration</h4> <ul> ! <li><a mXattribut="href:packages" target="content">Packages Management</a></li> <li><a mXattribut="href:accounts" target="content">Accounts Management</a></li> <li><a mXattribut="href:permissions" target="content">Permissions Management</a></li> |
|
From: <jhe...@us...> - 2002-11-20 12:15:10
|
Update of /cvsroot/upcase-project/UpCase/templates/en In directory sc8-pr-cvs1:/tmp/cvs-serv12263 Modified Files: category.mxt Log Message: templates modifications Index: category.mxt =================================================================== RCS file: /cvsroot/upcase-project/UpCase/templates/en/category.mxt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** category.mxt 13 Nov 2002 08:41:31 -0000 1.1 --- category.mxt 20 Nov 2002 12:15:06 -0000 1.2 *************** *** 19,26 **** </tr> <tr bgcolor="AAAAAA"> ! <td align="center"> <a mxAttribut="href:installer">Install</a> </td> - <td align="center">Upgrade</td> </tr> --- 19,25 ---- </tr> <tr bgcolor="AAAAAA"> ! <td align="center" colspan="2"> <a mxAttribut="href:installer">Install</a> </td> </tr> *************** *** 50,55 **** <tr bgcolor="EEEEEE"> <td width="33%" align="center"><mx:text id="pkgver" /></td> ! <td width="33%" align="center"><mx:text id="pkgurl" /></td> <td width="33%" align="center"><mx:text id="pkgstatus" /></td> </tr> </mx:bloc id="instances"> --- 49,58 ---- <tr bgcolor="EEEEEE"> <td width="33%" align="center"><mx:text id="pkgver" /></td> ! <td width="33%" align="left"> ! <a mxAttribut="href:pkgurl"> ! <mx:text id="pkgurl" /></a> ! </td> <td width="33%" align="center"><mx:text id="pkgstatus" /></td> + <td><a mxAttribut="href:uninstall">Uninstall</a></td> </tr> </mx:bloc id="instances"> |
|
From: <jhe...@us...> - 2002-11-20 12:11:30
|
Update of /cvsroot/upcase-project/UpCase In directory sc8-pr-cvs1:/tmp/cvs-serv10991 Modified Files: install.php Log Message: added a field to set the site URL Index: install.php =================================================================== RCS file: /cvsroot/upcase-project/UpCase/install.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install.php 20 Nov 2002 11:48:43 -0000 1.6 --- install.php 20 Nov 2002 12:11:24 -0000 1.7 *************** *** 9,12 **** --- 9,15 ---- // Check if we have all we need to access the database // else display a from to get the info. + $dbhost = "localhost"; + $tblprefix = "upcase_"; + if (empty($dbname) || empty($dbuser) || empty($dbpasswd) || empty($dbhost) || empty($tblprefix) || empty($admname) || empty($admpasswd) *************** *** 18,39 **** <table> <tr> <td>Database Name : </td><td><input type="text" name="dbname" ! value=<?=$dbname?>></td> </tr> <tr> <td>Database User : </td><td><input type="text" name="dbuser" ! value=<?=$dbuser?>></td> </tr> <tr> <td>Database Password : </td><td><input type="text" name="dbpasswd" ! value=<?=$dbpasswd?>></td> </tr> <tr> <td>Database Host : </td><td><input type="text" name="dbhost" ! value=<?=$dbhost?>></td> </tr> <tr> <td>Tables prefix : </td><td><input type="text" name="tblprefix" ! value=<?=$tblprefix?>></td> </tr> </table> --- 21,49 ---- <table> <tr> + <td>Site Url : </td><td>http://<input type="text" name="siteUrl" + value="<?=$HTTP_HOST?>"></td> + </tr> + </table> + <hr> + <table> + <tr> <td>Database Name : </td><td><input type="text" name="dbname" ! value="<?=$dbname?>"></td> </tr> <tr> <td>Database User : </td><td><input type="text" name="dbuser" ! value="<?=$dbuser?>"></td> </tr> <tr> <td>Database Password : </td><td><input type="text" name="dbpasswd" ! value="<?=$dbpasswd?>"></td> </tr> <tr> <td>Database Host : </td><td><input type="text" name="dbhost" ! value="<?=$dbhost?>"></td> </tr> <tr> <td>Tables prefix : </td><td><input type="text" name="tblprefix" ! value="<?=$tblprefix?>"></td> </tr> </table> *************** *** 42,62 **** <tr> <td>Admin user name : </td><td><input type="text" name="admname" ! value=<?=$admname?>></td> </tr> <tr> <td>First Name : </td><td><input type="text" name="admfirst" ! value=<?=$admfirst?>></td> </tr> <tr> <td>Last Name : </td><td><input type="text" name="admlast" ! value=<?=$admlast?>></td> </tr> <tr> <td>Email : </td><td><input type="text" name="admmail" ! value=<?=$admmail?>></td> </tr> <tr> <td>Admin password : </td><td><input type="text" name="admpasswd" ! value=<?=$admpasswd?>></td> </tr> </table> --- 52,72 ---- <tr> <td>Admin user name : </td><td><input type="text" name="admname" ! value="<?=$admname?>"></td> </tr> <tr> <td>First Name : </td><td><input type="text" name="admfirst" ! value="<?=$admfirst?>"></td> </tr> <tr> <td>Last Name : </td><td><input type="text" name="admlast" ! value="<?=$admlast?>"></td> </tr> <tr> <td>Email : </td><td><input type="text" name="admmail" ! value="<?=$admmail?>"></td> </tr> <tr> <td>Admin password : </td><td><input type="text" name="admpasswd" ! value="<?=$admpasswd?>"></td> </tr> </table> *************** *** 100,109 **** $siteRoot = $DOCUMENT_ROOT; // Web site root URL ! $siteUrl = $HTTP_HOST; // ucpase document root $upcaseRoot = dirname($DOCUMENT_ROOT . $PHP_SELF); // upcase root URL ! $upcaseUrl = dirname($HTTP_HOST . $PHP_SELF); --- 110,121 ---- $siteRoot = $DOCUMENT_ROOT; // Web site root URL ! if (empty($siteUrl)) ! $siteUrl = $HTTP_HOST; // ucpase document root $upcaseRoot = dirname($DOCUMENT_ROOT . $PHP_SELF); // upcase root URL ! $upcaseUrl = "http://" . dirname($siteUrl . $PHP_SELF); ! $siteUrl = "http://" . $siteUrl; *************** *** 118,124 **** <paths> <siteroot>$siteRoot</siteroot> ! <siteurl>http://$siteUrl</siteurl> <upcaseroot>$upcaseRoot</upcaseroot> ! <upcaseurl>http://$upcaseUrl</upcaseurl> </paths> --- 130,136 ---- <paths> <siteroot>$siteRoot</siteroot> ! <siteurl>$siteUrl</siteurl> <upcaseroot>$upcaseRoot</upcaseroot> ! <upcaseurl>$upcaseUrl</upcaseurl> </paths> |
|
From: <jhe...@us...> - 2002-11-20 11:48:46
|
Update of /cvsroot/upcase-project/UpCase
In directory sc8-pr-cvs1:/tmp/cvs-serv2914
Modified Files:
install.php
Log Message:
set default language to english for admin user, install script redirect to upcase index
Index: install.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/install.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install.php 14 Nov 2002 11:24:58 -0000 1.5
--- install.php 20 Nov 2002 11:48:43 -0000 1.6
***************
*** 89,95 ****
// insert administrator
$query = "INSERT INTO " . $tblprefix . "users (groupid, username, firstname, "
! . "lastname, email, password)"
. " values('0', '" . $admname . "', '" . $admfirst . "', '"
! . $admlast . "', '" . $admmail . "', '" . $admpasswd . "')";
$db->Execute($query) or die("Unable to create admin user: " .
--- 89,95 ----
// insert administrator
$query = "INSERT INTO " . $tblprefix . "users (groupid, username, firstname, "
! . "lastname, email, password, preferred_lang)"
. " values('0', '" . $admname . "', '" . $admfirst . "', '"
! . $admlast . "', '" . $admmail . "', '" . $admpasswd . "', 'en')";
$db->Execute($query) or die("Unable to create admin user: " .
***************
*** 212,216 ****
fclose($fd);
! print("Configuration done<br>");
?>
--- 212,216 ----
fclose($fd);
! header("Location: $upcaseUrl");
?>
|
|
From: <jhe...@us...> - 2002-11-14 11:34:10
|
Update of /cvsroot/upcase-project/UpCase/packages/dl In directory usw-pr-cvs1:/tmp/cvs-serv29992/dl Log Message: Directory /cvsroot/upcase-project/UpCase/packages/dl added to the repository |
|
From: <jhe...@us...> - 2002-11-14 11:33:54
|
Update of /cvsroot/upcase-project/UpCase/packages/db In directory usw-pr-cvs1:/tmp/cvs-serv29903/db Log Message: Directory /cvsroot/upcase-project/UpCase/packages/db added to the repository |
|
From: <jhe...@us...> - 2002-11-14 11:30:23
|
Update of /cvsroot/upcase-project/UpCase/admin
In directory usw-pr-cvs1:/tmp/cvs-serv28910/admin
Modified Files:
installer.php
Log Message:
more path fixing ...
Index: installer.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/installer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** installer.php 14 Nov 2002 11:20:02 -0000 1.2
--- installer.php 14 Nov 2002 11:30:20 -0000 1.3
***************
*** 56,60 ****
$tmpl = new ModeliXe($uc_tmpl["INSTALLER"]);
$tmpl->SetModeliXe();
! $tmpl->MxAttribut("installer", $ucConfig->upcaseRoot . "/admin/installer.php");
$tmpl->MxText("pkgname", $package->name);
$tmpl->MxText("siteroot", $ucConfig->siteUrl . "/");
--- 56,60 ----
$tmpl = new ModeliXe($uc_tmpl["INSTALLER"]);
$tmpl->SetModeliXe();
! $tmpl->MxAttribut("installer", $ucConfig->upcaseUrl . "/admin/installer.php");
$tmpl->MxText("pkgname", $package->name);
$tmpl->MxText("siteroot", $ucConfig->siteUrl . "/");
|
|
From: <jhe...@us...> - 2002-11-14 11:25:01
|
Update of /cvsroot/upcase-project/UpCase In directory usw-pr-cvs1:/tmp/cvs-serv27400 Modified Files: install.php Log Message: urls fixing Index: install.php =================================================================== RCS file: /cvsroot/upcase-project/UpCase/install.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install.php 14 Nov 2002 10:54:51 -0000 1.4 --- install.php 14 Nov 2002 11:24:58 -0000 1.5 *************** *** 118,128 **** <paths> <siteroot>$siteRoot</siteroot> ! <siteurl>$siteUrl</siteurl> <upcaseroot>$upcaseRoot</upcaseroot> ! <upcaseurl>$upcaseUrl</upcaseurl> ! ! <modules>$modules</modules> ! <rooturl>http://$rooturl</rooturl> ! <modsurl>http://$modsurl</modsurl> </paths> --- 118,124 ---- <paths> <siteroot>$siteRoot</siteroot> ! <siteurl>http://$siteUrl</siteurl> <upcaseroot>$upcaseRoot</upcaseroot> ! <upcaseurl>http://$upcaseUrl</upcaseurl> </paths> |
|
From: <jhe...@us...> - 2002-11-14 11:20:30
|
Update of /cvsroot/upcase-project/UpCase/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26101
Modified Files:
uc_installer.php
Log Message:
path fixing
Index: uc_installer.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_installer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uc_installer.php 14 Nov 2002 11:00:11 -0000 1.2
--- uc_installer.php 14 Nov 2002 11:20:27 -0000 1.3
***************
*** 28,34 ****
{
$cfg = $GLOBALS["ucConfig"];
! $this->metaBackup = $cfg->filesRoot . "/packages/db";
$this->db = new UcSql();
! $this->tmpDir = $cfg->filesRoot . "/packages/dl";
}
--- 28,34 ----
{
$cfg = $GLOBALS["ucConfig"];
! $this->metaBackup = $cfg->upcaseRoot . "/packages/db";
$this->db = new UcSql();
! $this->tmpDir = $cfg->upcaseRoot . "/packages/dl";
}
|
|
From: <jhe...@us...> - 2002-11-14 11:20:05
|
Update of /cvsroot/upcase-project/UpCase/admin
In directory usw-pr-cvs1:/tmp/cvs-serv25921
Modified Files:
installer.php
Log Message:
path fixing
Index: installer.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/installer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** installer.php 12 Nov 2002 17:44:44 -0000 1.1
--- installer.php 14 Nov 2002 11:20:02 -0000 1.2
***************
*** 56,63 ****
$tmpl = new ModeliXe($uc_tmpl["INSTALLER"]);
$tmpl->SetModeliXe();
!
! $tmpl->MxAttribut("installer", $ucConfig->wwwRoot . "/admin/installer.php");
$tmpl->MxText("pkgname", $package->name);
! $tmpl->MxText("siteroot", $ucConfig->wwwModules . "/");
$tmpl->MxText("catname", $category->name);
$tmpl->MxWrite();
--- 56,62 ----
$tmpl = new ModeliXe($uc_tmpl["INSTALLER"]);
$tmpl->SetModeliXe();
! $tmpl->MxAttribut("installer", $ucConfig->upcaseRoot . "/admin/installer.php");
$tmpl->MxText("pkgname", $package->name);
! $tmpl->MxText("siteroot", $ucConfig->siteUrl . "/");
$tmpl->MxText("catname", $category->name);
$tmpl->MxWrite();
***************
*** 74,80 ****
else
die("You MUST specify a tables prefix");
-
$inst->saveMetaData($package);
- // $pkgAbsolutePath = $cfg->modulesRoot . "/" . $pkgRelUrl;
$inst->install($package, $pkgRelUrl, $tblPrefix);
}
--- 73,77 ----
***************
*** 83,90 ****
die("Not yet implemented upgrade feature");
}
-
-
- // output
- //$tmpl->MxWrite();
?>
--- 80,83 ----
|
|
From: <jhe...@us...> - 2002-11-14 11:01:15
|
Update of /cvsroot/upcase-project/UpCase/lib
In directory usw-pr-cvs1:/tmp/cvs-serv19531
Modified Files:
uc_repository.php
Log Message:
renamed variables for path config
Index: uc_repository.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_repository.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** uc_repository.php 12 Nov 2002 11:06:16 -0000 1.1
--- uc_repository.php 14 Nov 2002 11:01:12 -0000 1.2
***************
*** 73,77 ****
{
$cfg = $GLOBALS["ucConfig"];
! $this->UcRepositoryObject($cfg->filesRoot . REPOSITORY_ROOT,
$GLOBALS["packagesSource"]);
$this->name = "repository";
--- 73,77 ----
{
$cfg = $GLOBALS["ucConfig"];
! $this->UcRepositoryObject($cfg->upcaseRoot . REPOSITORY_ROOT,
$GLOBALS["packagesSource"]);
$this->name = "repository";
|
|
From: <jhe...@us...> - 2002-11-14 11:00:14
|
Update of /cvsroot/upcase-project/UpCase/lib
In directory usw-pr-cvs1:/tmp/cvs-serv19051
Modified Files:
uc_installer.php
Log Message:
renamed some paths
Index: uc_installer.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_installer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** uc_installer.php 12 Nov 2002 11:01:00 -0000 1.1
--- uc_installer.php 14 Nov 2002 11:00:11 -0000 1.2
***************
*** 110,128 ****
}
! function unpack($package, $path)
{
- print("$path<br>");
$archive = new Archive_Tar($this->tmpDir
. "/" . $package->source, true);
! return $archive->extractModify($path, $package->name . "-"
. $package->version
. "-uc");
}
! function setupMySQL($package, $path, $tblPrefix)
{
$tblprefix = $tblPrefix . "_";
! include($path . MYSQL_QUERIES);
!
foreach($queries as $query)
{
--- 110,126 ----
}
! function unpack($package, $toPath)
{
$archive = new Archive_Tar($this->tmpDir
. "/" . $package->source, true);
! return $archive->extractModify($toPath, $package->name . "-"
. $package->version
. "-uc");
}
! function setupMySQL($package, $sqlPath, $tblPrefix)
{
$tblprefix = $tblPrefix . "_";
! include($sqlPath . MYSQL_QUERIES);
foreach($queries as $query)
{
***************
*** 131,139 ****
. "Error: " . $this->db->ErrorMsg());
}
-
return true;
}
! function setupPackage($package, $path, $tblPrefix)
{
$cfg = $GLOBALS["ucConfig"];
--- 129,136 ----
. "Error: " . $this->db->ErrorMsg());
}
return true;
}
! function setupPackage($package, $relPath, $tblPrefix)
{
$cfg = $GLOBALS["ucConfig"];
***************
*** 146,161 ****
$dbinf->prefix = $tblPrefix . "_";
! include_once($path . PACKAGE_SETUP);
! setup($dbinf, $cfg->wwwModules . "/" . basename($path),
! $path)
or die("Unable to setup package");
return true;
}
! function registerPackage($package, $path, $tblPrefix)
{
$query = sprintf($GLOBALS["ucsql_packageregister"],
$package->name, $package->version,
! $path, $tblPrefix);
$this->db->Execute($query)
or die("Unable to register package: " . $this->db->ErrorMsg());
--- 143,158 ----
$dbinf->prefix = $tblPrefix . "_";
! include_once($cfg->siteRoot . "/" . $relPath . PACKAGE_SETUP);
! setup($dbinf, $cfg->siteUrl . "/" . $relPath,
! $cfg->siteRoot . "/" .$relPath)
or die("Unable to setup package");
return true;
}
! function registerPackage($package, $relPath, $tblPrefix)
{
$query = sprintf($GLOBALS["ucsql_packageregister"],
$package->name, $package->version,
! $relPath, $tblPrefix);
$this->db->Execute($query)
or die("Unable to register package: " . $this->db->ErrorMsg());
***************
*** 163,172 ****
}
! function setInstallComplete($package, $path, $tblPrefix)
{
$query = sprintf($GLOBALS["ucsql_packageinstcomp"],
$package->name, $package->version,
! $path, $tblPrefix);
! print("$query<br>");
$this->db->Execute($query)
or die("Unable to flag package as installed: " .
--- 160,168 ----
}
! function setInstallComplete($package, $relPath, $tblPrefix)
{
$query = sprintf($GLOBALS["ucsql_packageinstcomp"],
$package->name, $package->version,
! $relPath, $tblPrefix);
$this->db->Execute($query)
or die("Unable to flag package as installed: " .
***************
*** 174,181 ****
}
! function install($package, $pkgRelUrl, $tblPrefix)
{
$cfg = $GLOBALS["ucConfig"];
! $pkgPath = $cfg->modulesRoot . "/" . $pkgRelUrl;
$this->download($package)
--- 170,177 ----
}
! function install($package, $relPath, $tblPrefix)
{
$cfg = $GLOBALS["ucConfig"];
! $pkgPath = $cfg->siteRoot . "/" . $relPath;
$this->download($package)
***************
*** 183,187 ****
$this->checkPathValidity($pkgPath)
or die("Invalid URL");
! $this->registerPackage($package, $pkgRelUrl, $tblPrefix)
or die("Unable to register package to be installed");
createDirectory($pkgPath)
--- 179,183 ----
$this->checkPathValidity($pkgPath)
or die("Invalid URL");
! $this->registerPackage($package, $relPath, $tblPrefix)
or die("Unable to register package to be installed");
createDirectory($pkgPath)
***************
*** 191,197 ****
$this->setupMySQL($package, $pkgPath, $tblPrefix)
or die("Unable to set up MySQL");
! $this->setupPackage($package, $pkgPath, $tblPrefix)
or die("Unable to set up package");
! $this->setInstallComplete($package, $pkgRelUrl, $tblPrefix);
}
--- 187,193 ----
$this->setupMySQL($package, $pkgPath, $tblPrefix)
or die("Unable to set up MySQL");
! $this->setupPackage($package, $relPath, $tblPrefix)
or die("Unable to set up package");
! $this->setInstallComplete($package, $relPath, $tblPrefix);
}
|
|
From: <jhe...@us...> - 2002-11-14 10:59:16
|
Update of /cvsroot/upcase-project/UpCase/lib
In directory usw-pr-cvs1:/tmp/cvs-serv18737
Modified Files:
uc_config.php
Log Message:
renamed config paths
Index: uc_config.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uc_config.php 5 Aug 2002 08:21:07 -0000 1.2
--- uc_config.php 14 Nov 2002 10:59:13 -0000 1.3
***************
*** 12,16 ****
* @access public
*/
! var $wwwRoot;
/**
--- 12,16 ----
* @access public
*/
! var $upcaseUrl;
/**
***************
*** 20,24 ****
* @access public
*/
! var $filesRoot;
/**
--- 20,24 ----
* @access public
*/
! var $upcaseRoot;
/**
***************
*** 28,32 ****
* @access public
*/
! var $wwwModules;
/**
--- 28,32 ----
* @access public
*/
! var $siteUrl;
/**
***************
*** 36,40 ****
* @access public
*/
! var $modulesRoot;
/**
--- 36,40 ----
* @access public
*/
! var $siteRoot;
/**
***************
*** 72,87 ****
$pathNode = $ar[0];
! $ar = $pathNode->getElements("rooturl");
! $this->wwwRoot = $ar[0]->textElements[0];
-
- $ar = $pathNode->getElements("modsurl");
- $this->wwwModules = $ar[0]->textElements[0];
-
- $ar = $pathNode->getElements("docroot");
- $this->filesRoot = $ar[0]->textElements[0];
-
- $ar = $pathNode->getElements("modules");
- $this->modulesRoot = $ar[0]->textElements[0];
$ar = $tree->getElements("languages");
--- 72,84 ----
$pathNode = $ar[0];
! $ar = $pathNode->getElements("siteroot");
! $this->siteRoot = $ar[0]->textElements[0];
! $ar = $pathNode->getElements("siteurl");
! $this->siteUrl = $ar[0]->textElements[0];
! $ar = $pathNode->getElements("upcaseroot");
! $this->upcaseRoot = $ar[0]->textElements[0];
! $ar = $pathNode->getElements("upcaseurl");
! $this->upcaseUrl = $ar[0]->textElements[0];
$ar = $tree->getElements("languages");
|
|
From: <jhe...@us...> - 2002-11-14 10:54:54
|
Update of /cvsroot/upcase-project/UpCase
In directory usw-pr-cvs1:/tmp/cvs-serv17220
Modified Files:
install.php
Log Message:
corrected more path for config file installation
Index: install.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/install.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** install.php 14 Nov 2002 10:46:47 -0000 1.3
--- install.php 14 Nov 2002 10:54:51 -0000 1.4
***************
*** 157,161 ****
// Write it to disk
! $fd = fopen($docroot . "/config/upcase.xml", "w");
fwrite($fd, $xmlConfig);
fclose($fd);
--- 157,161 ----
// Write it to disk
! $fd = fopen($upcaseRoot . "/config/upcase.xml", "w");
fwrite($fd, $xmlConfig);
fclose($fd);
***************
*** 163,178 ****
$ucConfig =
'<?php
! ini_set("include_path", ".:' . $docroot . ':' . $docroot . '/config");
include_once("lib/uc_config.php");
! $xmlConf = "' . $docroot . '/config/upcase.xml";
$ucConfig = new UcConfig($xmlConf);
// ModeliXe config
! define("MX_GENERAL_PATH", $ucConfig->filesRoot . "config/");
! define("MX_ERROR_PATH", $ucConfig->filesRoot . "lib/");
// translation files
$uc_translations["object_descriptions"] =
! $ucConfig->filesRoot . "/templates/objdescr.xml";
// Message pages
! $msgdir = $ucConfig->wwwRoot . "/admin/messages";
$uc_info["objectRegistered"] = $msgdir . "/newobject.php";
$uc_info["badLoginMsg"] = $msgdir . "/badlogin.php";
--- 163,178 ----
$ucConfig =
'<?php
! ini_set("include_path", ".:' . $upcaseRoot . ':' . $upcaseRoot . '/config");
include_once("lib/uc_config.php");
! $xmlConf = "' . $upcaseRoot . '/config/upcase.xml";
$ucConfig = new UcConfig($xmlConf);
// ModeliXe config
! define("MX_GENERAL_PATH", $ucConfig->upcaseRoot . "config/");
! define("MX_ERROR_PATH", $ucConfig->upcaseRoot . "lib/");
// translation files
$uc_translations["object_descriptions"] =
! $ucConfig->upcaseRoot . "/templates/objdescr.xml";
// Message pages
! $msgdir = $ucConfig->upcaseUrl . "/admin/messages";
$uc_info["objectRegistered"] = $msgdir . "/newobject.php";
$uc_info["badLoginMsg"] = $msgdir . "/badlogin.php";
***************
*** 185,189 ****
// Write it to disk
! $fd = fopen($docroot . "/config/uc_config.inc", "w");
fwrite($fd, $ucConfig);
fclose($fd);
--- 185,189 ----
// Write it to disk
! $fd = fopen($upcaseRoot . "/config/uc_config.inc", "w");
fwrite($fd, $ucConfig);
fclose($fd);
***************
*** 195,201 ****
define(\'MX_FLAGS_TYPE\', \'xml\'); //Précise le mode d\'écriture des templates par défaut (xml ou pear).
define(\'MX_OUTPUT_TYPE\', \'xhtml\'); //Précise le type de balisage en sortie.
! define(\'MX_TEMPLATE_PATH\', \'' . $docroot . '/templates\'); //Précise le répertoire de template par défaut.
define(\'MX_DEFAULT_PARAMETER\', \'\'); //Précise un fichier de paramètres par défaut.
! define(\'MX_CACHE_PATH\', \'' . $docroot . '/cache\'); //Précise le répertoire du cache.
define(\'MX_CACHE_DELAY\', 0); //Définit le délai de renouvellement du cache en secondes.
define(\'MX_SIGNATURE\', \'off\'); //Laisse la signature de ModeliXe dans la page HTML générée (on ou off).
--- 195,201 ----
define(\'MX_FLAGS_TYPE\', \'xml\'); //Précise le mode d\'écriture des templates par défaut (xml ou pear).
define(\'MX_OUTPUT_TYPE\', \'xhtml\'); //Précise le type de balisage en sortie.
! define(\'MX_TEMPLATE_PATH\', \'' . $upcaseRoot . '/templates\'); //Précise le répertoire de template par défaut.
define(\'MX_DEFAULT_PARAMETER\', \'\'); //Précise un fichier de paramètres par défaut.
! define(\'MX_CACHE_PATH\', \'' . $upcaseRoot . '/cache\'); //Précise le répertoire du cache.
define(\'MX_CACHE_DELAY\', 0); //Définit le délai de renouvellement du cache en secondes.
define(\'MX_SIGNATURE\', \'off\'); //Laisse la signature de ModeliXe dans la page HTML générée (on ou off).
***************
*** 212,216 ****
// Write it to disk
! $fd = fopen($docroot . "/config/Mxconf.php", "w");
fwrite($fd, $mxConf);
fclose($fd);
--- 212,216 ----
// Write it to disk
! $fd = fopen($upcaseRoot . "/config/Mxconf.php", "w");
fwrite($fd, $mxConf);
fclose($fd);
|
|
From: <jhe...@us...> - 2002-11-14 10:46:50
|
Update of /cvsroot/upcase-project/UpCase In directory usw-pr-cvs1:/tmp/cvs-serv14273 Modified Files: install.php Log Message: renaming of root urls and path variables Index: install.php =================================================================== RCS file: /cvsroot/upcase-project/UpCase/install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.php 13 Nov 2002 08:58:02 -0000 1.2 --- install.php 14 Nov 2002 10:46:47 -0000 1.3 *************** *** 97,105 **** ! $docroot = dirname($DOCUMENT_ROOT . $PHP_SELF); ! $modules = $DOCUMENT_ROOT; - $rooturl = $HTTP_HOST . "/upcase"; - $modsurl = $HTTP_HOST; // Create the config file --- 97,110 ---- ! // Web site document root ! $siteRoot = $DOCUMENT_ROOT; ! // Web site root URL ! $siteUrl = $HTTP_HOST; ! ! // ucpase document root ! $upcaseRoot = dirname($DOCUMENT_ROOT . $PHP_SELF); ! // upcase root URL ! $upcaseUrl = dirname($HTTP_HOST . $PHP_SELF); // Create the config file *************** *** 112,116 **** --> <paths> ! <docroot>$docroot</docroot> <modules>$modules</modules> <rooturl>http://$rooturl</rooturl> --- 117,125 ---- --> <paths> ! <siteroot>$siteRoot</siteroot> ! <siteurl>$siteUrl</siteurl> ! <upcaseroot>$upcaseRoot</upcaseroot> ! <upcaseurl>$upcaseUrl</upcaseurl> ! <modules>$modules</modules> <rooturl>http://$rooturl</rooturl> |
|
From: <jhe...@us...> - 2002-11-14 10:39:19
|
Update of /cvsroot/upcase-project/UpCase/admin
In directory usw-pr-cvs1:/tmp/cvs-serv11954
Modified Files:
category.php
Log Message:
adjusted path from config
Index: category.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/category.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** category.php 12 Nov 2002 17:42:45 -0000 1.1
--- category.php 14 Nov 2002 10:39:16 -0000 1.2
***************
*** 55,59 ****
foreach ($packages as $package)
{
! $tmpl->MxUrl("packages.pkgurl", $ucConfig->wwwRoot . "/admin/package.php",
array("name" => $package->name));
$tmpl->MxText("packages.pkgname", $package->name);
--- 55,59 ----
foreach ($packages as $package)
{
! $tmpl->MxUrl("packages.pkgurl", $ucConfig->upcaseUrl . "/admin/package.php",
array("name" => $package->name));
$tmpl->MxText("packages.pkgname", $package->name);
***************
*** 63,67 ****
$tmpl->MxText("packages.pkgver", $package->version);
$tmpl->MxUrl("packages.installer",
! $ucConfig->wwwRoot . "/admin/installer.php",
array("cat" => $catname, "pkg" => $package->name));
--- 63,67 ----
$tmpl->MxText("packages.pkgver", $package->version);
$tmpl->MxUrl("packages.installer",
! $ucConfig->upcaseUrl . "/admin/installer.php",
array("cat" => $catname, "pkg" => $package->name));
|
|
From: <jhe...@us...> - 2002-11-14 10:36:03
|
Update of /cvsroot/upcase-project/UpCase/admin
In directory usw-pr-cvs1:/tmp/cvs-serv11060
Modified Files:
repository.php
Log Message:
adjusted urls to site root
Index: repository.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/admin/repository.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** repository.php 12 Nov 2002 17:53:13 -0000 1.1
--- repository.php 14 Nov 2002 10:35:59 -0000 1.2
***************
*** 22,26 ****
$user = $sess->getUser();
// other includes
- include_once("lib/uc_packages.php");
include_once("lib/uc_repository.php");
--- 22,25 ----
***************
*** 38,42 ****
$rep->update();
! $tmpl->MxUrl("repupdate", $ucConfig->wwwRoot . "/admin/repository.php?doupdate=1");
$tmpl->MxText("descr", $rep->description[$user->lang]);
--- 37,41 ----
$rep->update();
! $tmpl->MxUrl("repupdate", $ucConfig->upcaseUrl . "/admin/repository.php?doupdate=1");
$tmpl->MxText("descr", $rep->description[$user->lang]);
***************
*** 47,51 ****
$tmpl->MxText("categories.catname", $category->description[$user->lang]);
$tmpl->MxUrl("categories.caturl",
! $ucConfig->wwwRoot . "/admin/category.php",
array("catname" => $category->name));
$tmpl->MxBloc("categories", "loop");
--- 46,50 ----
$tmpl->MxText("categories.catname", $category->description[$user->lang]);
$tmpl->MxUrl("categories.caturl",
! $ucConfig->upcaseUrl . "/admin/category.php",
array("catname" => $category->name));
$tmpl->MxBloc("categories", "loop");
|
|
From: <jhe...@us...> - 2002-11-13 09:20:05
|
Update of /cvsroot/upcase-project/UpCase/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21548
Modified Files:
uc_packages.php
Log Message:
class redefined in uc_repository.php
Index: uc_packages.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_packages.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uc_packages.php 5 Aug 2002 08:32:01 -0000 1.2
--- uc_packages.php 13 Nov 2002 09:20:01 -0000 1.3
***************
*** 2,7 ****
include_once("lib/Tar.php");
! class UcPackage
{
var $name;
--- 2,11 ----
include_once("lib/Tar.php");
+ include_once("lib/uc_sql.php");
! define("CATEGORY", 1);
! define("PACKAGE", 2);
!
! class UcPackage1
{
var $name;
***************
*** 9,28 ****
var $description;
var $home;
- var $ucurl;
var $tarball;
var $status;
var $setup;
! function install($destDir)
{
! global $ucConfig;
! $ar = parse_url($this->tarball);
! $tbname = basename($ar["path"]);
! $from_fd = fopen($this->tarball, "rb");
! $to_fd = fopen($destDir . "/" . $tbname, "wb");
$buffer = '';
!
while ($buffer = fread($from_fd, 1024))
{
--- 13,45 ----
var $description;
var $home;
var $tarball;
var $status;
var $setup;
+ var $db;
+
+ var $dlOk;
+ var $unpackOk;
! function UcPackage()
{
! $cfg = $GLOBALS["ucConfig"];
! $this->setupDir = $cfg->modulesRoot . "/" . $this->name
! . "/upcase/";
!
! $this->db = new UcSql();
! $this->dlOk = false;
! $this->unpackOk = false;
! }
!
! function download()
! {
! $cfg = $GLOBALS["ucConfig"];
! $src = $GLOBALS["packagesSource"];
! $from_fd = fopen($src . "/" . $this->tarball, "rb");
! $to_fd = fopen($cfg->modulesRoot . "/" . $this->tarball, "wb");
$buffer = '';
!
while ($buffer = fread($from_fd, 1024))
{
***************
*** 30,53 ****
flush();
if ($res < 1024)
- {
break;
- }
}
-
fclose($from_fd);
fclose($to_fd);
!
if ($res > -1)
{
! flush();
! $tar = new Archive_Tar($destDir . "/" . $tbname, true);
! $tar->extract($destDir);
! symlink($destDir . "/" . basename($tbname, ".tar.gz"),
! $destDir . "/" . $this->name);
}
! $setupPage = $ucConfig->wwwRoot . "/modules/" . $this->name
! . "/" . $this->setup;
! header("Location: $setupPage");
}
}
--- 47,131 ----
flush();
if ($res < 1024)
break;
}
fclose($from_fd);
fclose($to_fd);
!
if ($res > -1)
+ $this->dlOk = true;
+ }
+
+ function unpack()
+ {
+ $cfg = $GLOBALS["ucConfig"];
+ if (!$this->dlOk)
+ return;
+ $arch = $cfg->modulesRoot . "/" . $this->tarball;
+ print("<br><b>" . $arch . "</b><br>");
+ $tar = new Archive_Tar($arch, true);
+ $tar->extract($cfg->modulesRoot) or die("Unable to unpack archive");
+ symlink($cfg->modulesRoot . "/" . basename($this->tarball, ".tar.gz"),
+ $cfg->modulesRoot . "/" . $this->name);
+ $this->unpackOk = true;
+ }
+
+ function install()
+ {
+ $cfg = $GLOBALS["ucConfig"];
+
+ if (empty($this->setup))
{
! include_once($cfg->modulesRoot . "/" . $this->name
! . "/" . "/upcase/setup.php");
! pkg_install($cfg, $this);
! $this->mysqlSetup();
! }
! else
! {
! $setupPage = $ucConfig->wwwModules . "/" . $this->name
! . "/" . $this->setup;
! header("Location: $setupPage");
}
+ }
+
+ function mysqlSetup()
+ {
+ $cfg = $GLOBALS["ucConfig"];
+ $script = $cfg->modulesRoot . "/" . $this->name
+ . "/" . "/upcase/mysql-setup.php";
+ $tblprefix = $this->name . "_";
+ $proceed = include($script);
! if ($proceed)
! {
! foreach ($tables_create as $query)
! $this->db->Execute($query)
! or die("Error in install script, " . $this->db->ErrorMsg());
!
! foreach ($tables_insert as $query)
! $this->db->Execute($query)
! or die("Error in install script, " . $this->db->ErrorMsg());
!
! foreach ($tables_misc as $query)
! $this->db->Execute($query)
! or die("Error in install script, " . $this->db->ErrorMsg());
! }
! }
!
! function addAccounts()
! {
! global $ucConfig;
! global $ucsql_allusers;
!
! $query = $ucsql_allusers;
!
! include_once($ucConfig->modulesRoot . "/" . $this->name
! . "/upcase/accounts.php");
!
! $db = new UcSql();
! $res = $db->Execute($query) or die("Unable to get users: "
! . $db->ErrorMsg());
! while ($o = $res->FetchNextObject(true))
! addUser($ucConfig, $this, $o);
}
}
***************
*** 105,109 ****
}
! function get_package($name, $version)
{
$this->parse();
--- 183,187 ----
}
! function getPackage($name, $version)
{
$this->parse();
|
|
From: <jhe...@us...> - 2002-11-13 09:17:54
|
Update of /cvsroot/upcase-project/UpCase/config
In directory usw-pr-cvs1:/tmp/cvs-serv20513
Modified Files:
uc_tables.inc
Log Message:
set some permissions to accessible by all
Index: uc_tables.inc
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/config/uc_tables.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** uc_tables.inc 13 Nov 2002 08:58:21 -0000 1.3
--- uc_tables.inc 13 Nov 2002 09:17:51 -0000 1.4
***************
*** 54,57 ****
--- 54,60 ----
"UPDATE ${tblprefix}groups SET gid='0' WHERE groupname='admins';",
"INSERT INTO ${tblprefix}groups VALUES (1,'all');",
+ "INSERT INTO ${tblprefix}permissions VALUES ('menu', '1');",
+ "INSERT INTO ${tblprefix}permissions VALUES ('mainIndex', '1');",
+ "INSERT INTO ${tblprefix}permissions VALUES ('mainPage', '1');"
);
|
|
From: <jhe...@us...> - 2002-11-13 09:13:14
|
Update of /cvsroot/upcase-project/UpCase In directory usw-pr-cvs1:/tmp/cvs-serv18086 Added Files: index.html Log Message: simple index page --- NEW FILE: index.html --- <html> <frameset cols="25%,75%"> <frame name="menu" src="admin/menu.php"> <frame name="content" src=""> </frameset> </html> |
|
From: <jhe...@us...> - 2002-11-13 08:59:05
|
Update of /cvsroot/upcase-project/UpCase/config In directory usw-pr-cvs1:/tmp/cvs-serv10484 Modified Files: uc_templates.inc Log Message: added more templates Index: uc_templates.inc =================================================================== RCS file: /cvsroot/upcase-project/UpCase/config/uc_templates.inc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** uc_templates.inc 5 Aug 2002 07:58:05 -0000 1.2 --- uc_templates.inc 13 Nov 2002 08:59:02 -0000 1.3 *************** *** 12,19 **** --- 12,23 ---- $uc_tmpl["PACKAGES_INSTALL"] = $uc_lang . "/install.mxt"; $uc_tmpl["ADMIN_MENU"] = $uc_lang . "/adminmenu.mxt"; + $uc_tmpl["MAIN_PAGE"] = $uc_lang . "/mainpage.mxt"; $uc_tmpl["LOGIN_PAGE"] = $uc_lang . "/login.mxt"; $uc_tmpl["USERS_LIST"] = $uc_lang . "/userslist.mxt"; $uc_tmpl["USER_EDIT"] = $uc_lang . "/useredit.mxt"; $uc_tmpl["NEW_USER"] = $uc_lang . "/newuser.mxt"; + $uc_tmpl["NEW_GROUP"] = $uc_lang . "/newgroup.mxt"; + $uc_tmpl["GROUP_DELETE"] = $uc_lang . "/groupdel.mxt"; + $uc_tmpl["GROUP_WARNING"] = $uc_lang . "/groupwarn.mxt"; $uc_tmpl["USER_INFO"] = $uc_lang . "/userinfo.mxt"; $uc_tmpl["MAIN_INDEX"] = $uc_lang . "/mainindex.mxt"; *************** *** 21,23 **** --- 25,36 ---- $uc_tmpl["BAD_LOGIN"] = $uc_lang . "/badlogin.mxt"; $uc_tmpl["NEW_OBJECT"] = $uc_lang . "/newobject.mxt"; + $uc_tmpl["MENU"] = $uc_lang . "/menu.mxt"; + $uc_tmpl["ADMIN_MENU"] = $uc_lang . "/blocs/admmenu.mxt"; + $uc_tmpl["APP_MENU"] = $uc_lang . "/blocs/appmenu.mxt"; + $uc_tmpl["LOGIN"] = $uc_lang . "/blocs/login.mxt"; + $uc_tmpl["LOGOUT"] = $uc_lang . "/blocs/logout.mxt"; + $uc_tmpl["MY_ACCOUNT"] = $uc_lang . "/myaccount.mxt"; + $uc_tmpl["REPOSITORY"] = $uc_lang . "/repository.mxt"; + $uc_tmpl["CATEGORY"] = $uc_lang . "/category.mxt"; + $uc_tmpl["INSTALLER"] = $uc_lang . "/installer.mxt"; ?> |
|
From: <jhe...@us...> - 2002-11-13 08:58:24
|
Update of /cvsroot/upcase-project/UpCase/config
In directory usw-pr-cvs1:/tmp/cvs-serv10187
Modified Files:
uc_tables.inc
Log Message:
added table for installer
Index: uc_tables.inc
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/config/uc_tables.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** uc_tables.inc 8 Aug 2002 10:00:42 -0000 1.2
--- uc_tables.inc 13 Nov 2002 08:58:21 -0000 1.3
***************
*** 1,5 ****
<?php
! $tables_create = array(
"CREATE TABLE ${tblprefix}groupmembers (
gid int(4) default NULL,
--- 1,5 ----
<?php
! $queries = array(
"CREATE TABLE ${tblprefix}groupmembers (
gid int(4) default NULL,
***************
*** 12,15 ****
--- 12,24 ----
UNIQUE KEY groupname (groupname)
) TYPE=MyISAM;",
+ "CREATE TABLE ${tblprefix}installer (
+ pkgname varchar(50) default NULL,
+ pkgversion varchar(50) default NULL,
+ tblprefix varchar(50) default NULL,
+ pkgpath varchar(255) default NULL,
+ installed tinyint(1) NOT NULL default '0',
+ UNIQUE KEY tblprefix (tblprefix),
+ UNIQUE KEY pkgpath (pkgpath)
+ ) TYPE=MyISAM;",
"CREATE TABLE ${tblprefix}permissions (
oid varchar(50) NOT NULL default '',
***************
*** 34,50 ****
groupid int(4) NOT NULL default '0',
username varchar(50) NOT NULL default '',
password varchar(50) NOT NULL default '',
preferred_lang char(2) default NULL,
PRIMARY KEY (uid),
UNIQUE KEY username (username)
) TYPE=MyISAM;",
- );
-
-
- $tables_insert = array(
"INSERT INTO ${tblprefix}groups VALUES (0,'admins');",
"UPDATE ${tblprefix}groups SET gid='0' WHERE groupname='admins';",
! "INSERT INTO ${tblprefix}groups VALUES (-1,'all');",
! "INSERT INTO ${tblprefix}users VALUES (1,0,'admin','admin','en');",
);
--- 43,57 ----
groupid int(4) NOT NULL default '0',
username varchar(50) NOT NULL default '',
+ firstname varchar(50) NOT NULL default '',
+ lastname varchar(50) NOT NULL default '',
password varchar(50) NOT NULL default '',
preferred_lang char(2) default NULL,
+ email varchar(50) default NULL,
PRIMARY KEY (uid),
UNIQUE KEY username (username)
) TYPE=MyISAM;",
"INSERT INTO ${tblprefix}groups VALUES (0,'admins');",
"UPDATE ${tblprefix}groups SET gid='0' WHERE groupname='admins';",
! "INSERT INTO ${tblprefix}groups VALUES (1,'all');",
);
|
|
From: <jhe...@us...> - 2002-11-13 08:58:07
|
Update of /cvsroot/upcase-project/UpCase
In directory usw-pr-cvs1:/tmp/cvs-serv9971
Modified Files:
install.php
Log Message:
added table for installer
Index: install.php
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/install.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install.php 5 Aug 2002 07:47:26 -0000 1.1
--- install.php 13 Nov 2002 08:58:02 -0000 1.2
***************
*** 4,15 ****
include_once("./lib/adodb/adodb.inc.php");
// Check if we have all we need to access the database
// else display a from to get the info.
! if (!isset($dbname) || $dbname == ""
! || !isset($dbuser) || $dbuser == ""
! || !isset($dbpasswd) || $dbpasswd == ""
! || !isset($dbhost) || $dbhost == ""
! || !isset($tblprefix) || $tblprefix == "")
{
?>
--- 4,15 ----
include_once("./lib/adodb/adodb.inc.php");
+ // Check if the app is already configured
+ // Should stat config/upcase.xml
// Check if we have all we need to access the database
// else display a from to get the info.
! if (empty($dbname) || empty($dbuser) || empty($dbpasswd) || empty($dbhost)
! || empty($tblprefix) || empty($admname) || empty($admpasswd)
! || empty($admmail) || empty($admfirst) || empty($admlast))
{
?>
***************
*** 18,39 ****
<table>
<tr>
! <td>Database Name : </td><td><input type="text" name="dbname"></td>
</tr>
<tr>
! <td>Database User : </td><td><input type="text" name="dbuser"></td>
</tr>
<tr>
! <td>Database Password : </td><td><input type="text" name="dbpasswd"></td>
</tr>
<tr>
! <td>Database Host : </td><td><input type="text" name="dbhost"></td>
</tr>
<tr>
! <td>Tables prefix : </td><td><input type="text" name="tblprefix"></td>
</tr>
<tr>
! <td colspan="2"><input type="submit"></td>
</tr>
</table>
</form>
--- 18,65 ----
<table>
<tr>
! <td>Database Name : </td><td><input type="text" name="dbname"
! value=<?=$dbname?>></td>
</tr>
<tr>
! <td>Database User : </td><td><input type="text" name="dbuser"
! value=<?=$dbuser?>></td>
</tr>
<tr>
! <td>Database Password : </td><td><input type="text" name="dbpasswd"
! value=<?=$dbpasswd?>></td>
</tr>
<tr>
! <td>Database Host : </td><td><input type="text" name="dbhost"
! value=<?=$dbhost?>></td>
</tr>
<tr>
! <td>Tables prefix : </td><td><input type="text" name="tblprefix"
! value=<?=$tblprefix?>></td>
</tr>
+ </table>
+ <hr>
+ <table>
<tr>
! <td>Admin user name : </td><td><input type="text" name="admname"
! value=<?=$admname?>></td>
! </tr>
! <tr>
! <td>First Name : </td><td><input type="text" name="admfirst"
! value=<?=$admfirst?>></td>
! </tr>
! <tr>
! <td>Last Name : </td><td><input type="text" name="admlast"
! value=<?=$admlast?>></td>
! </tr>
! <tr>
! <td>Email : </td><td><input type="text" name="admmail"
! value=<?=$admmail?>></td>
! </tr>
! <tr>
! <td>Admin password : </td><td><input type="text" name="admpasswd"
! value=<?=$admpasswd?>></td>
</tr>
</table>
+ <input type="submit">
</form>
***************
*** 52,56 ****
// Execute each query one by one
! foreach ($tables_create as $query)
{
$res = $db->Execute($query);
--- 78,82 ----
// Execute each query one by one
! foreach ($queries as $query)
{
$res = $db->Execute($query);
***************
*** 61,78 ****
}
! foreach ($tables_insert as $query)
! {
! $res = $db->Execute($query);
! if (!$res)
! {
! die($db->ErrorMsg());
! }
! }
$docroot = dirname($DOCUMENT_ROOT . $PHP_SELF);
! $modules = $docroot . "/modules";
! $rooturl = $HTTP_HOST . "/UpCase";
! $modsurl = $rooturl . "/modules";
// Create the config file
--- 87,105 ----
}
! // insert administrator
! $query = "INSERT INTO " . $tblprefix . "users (groupid, username, firstname, "
! . "lastname, email, password)"
! . " values('0', '" . $admname . "', '" . $admfirst . "', '"
! . $admlast . "', '" . $admmail . "', '" . $admpasswd . "')";
!
! $db->Execute($query) or die("Unable to create admin user: " .
! $db->ErrorMsg());
!
$docroot = dirname($DOCUMENT_ROOT . $PHP_SELF);
! $modules = $DOCUMENT_ROOT;
! $rooturl = $HTTP_HOST . "/upcase";
! $modsurl = $HTTP_HOST;
// Create the config file
***************
*** 101,104 ****
--- 128,132 ----
<table data="sessions">sessions</table>
<table data="users">users</table>
+ <table data="installer">installer</table>
</database>
***************
*** 143,146 ****
--- 171,176 ----
$uc_info["adminsOnly"] = $msgdir . "/adminsonly.php";
$uc_info["sessionSteal"] = $msgdir . "/sessionsteal.php";
+ $packagesList = "http://galaad/UPCASE/packages/packages.xml";
+ $packagesSource = "http://galaad/UPCASE/packages";
?>';
|
|
From: <jhe...@us...> - 2002-11-13 08:41:35
|
Update of /cvsroot/upcase-project/UpCase/templates/en/blocs In directory usw-pr-cvs1:/tmp/cvs-serv1943/blocs Added Files: admmenu.mxt appmenu.mxt login.mxt logout.mxt Log Message: added some templates --- NEW FILE: admmenu.mxt --- <h4>Adminstration</h4> <ul> <li><a mXattribut="href:packages" target="content">Packages List</a></li> <li><a mXattribut="href:accounts" target="content">Accounts Management</a></li> <li><a mXattribut="href:permissions" target="content">Permissions Management</a></li> </ul> --- NEW FILE: appmenu.mxt --- <h4>Applications</h4> <ul> <mx:bloc id="appmenu"> <li><a mXattribut="href:appurl" target="content"><mx:text id="application" /></a></li> </mx:bloc id="appmenu"> </ul> --- NEW FILE: login.mxt --- <form> <font size=-3> Username : <br> <input type="text" name="username"><br> Password : <br> <input type="text" name="password"><br> <input type="submit" value="login"><br> </font> </form> --- NEW FILE: logout.mxt --- <font size=-3> You are logged in as <b><a mXattribut="href:myaccount" target="content"><mx:text id="username" /></a></b> (<a mXattribut="href:logout">Log out</a>) </font> |
