Menu
▾
▴
xoops-cvs2 — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(361) |
Oct
(65) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(798) |
Feb
(694) |
Mar
(586) |
Apr
(145) |
May
(24) |
Jun
(24) |
Jul
(56) |
Aug
(11) |
Sep
(138) |
Oct
(107) |
Nov
(58) |
Dec
(39) |
| 2004 |
Jan
(157) |
Feb
(24) |
Mar
(13) |
Apr
(14) |
May
(73) |
Jun
(106) |
Jul
(217) |
Aug
(91) |
Sep
(116) |
Oct
(357) |
Nov
(27) |
Dec
(272) |
| 2005 |
Jan
(97) |
Feb
(40) |
Mar
(167) |
Apr
(365) |
May
(344) |
Jun
(357) |
Jul
(407) |
Aug
(529) |
Sep
(204) |
Oct
(52) |
Nov
(80) |
Dec
(1) |
| 2006 |
Jan
(2) |
Feb
(1) |
Mar
(11) |
Apr
(112) |
May
(121) |
Jun
(86) |
Jul
(51) |
Aug
(48) |
Sep
(107) |
Oct
(20) |
Nov
(50) |
Dec
(11) |
| 2007 |
Jan
(7) |
Feb
(11) |
Mar
(8) |
Apr
(11) |
May
(2) |
Jun
(25) |
Jul
(67) |
Aug
(134) |
Sep
(54) |
Oct
(69) |
Nov
(10) |
Dec
(74) |
| 2008 |
Jan
(73) |
Feb
(81) |
Mar
(64) |
Apr
(98) |
May
(157) |
Jun
(68) |
Jul
(80) |
Aug
(108) |
Sep
(176) |
Oct
(107) |
Nov
(265) |
Dec
(60) |
| 2009 |
Jan
(149) |
Feb
(140) |
Mar
(195) |
Apr
(141) |
May
(53) |
Jun
(45) |
Jul
(98) |
Aug
(153) |
Sep
(160) |
Oct
(138) |
Nov
(139) |
Dec
(104) |
| 2010 |
Jan
(188) |
Feb
(259) |
Mar
(133) |
Apr
(104) |
May
(42) |
Jun
(121) |
Jul
(38) |
Aug
(223) |
Sep
(259) |
Oct
(255) |
Nov
(106) |
Dec
(157) |
| 2011 |
Jan
(202) |
Feb
(110) |
Mar
(261) |
Apr
(272) |
May
(218) |
Jun
(108) |
Jul
(141) |
Aug
(205) |
Sep
(326) |
Oct
(279) |
Nov
(368) |
Dec
(238) |
| 2012 |
Jan
(239) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <on...@us...> - 2002-09-18 23:41:21
|
Update of /cvsroot/xoops/xoops-current/html/include
In directory usw-pr-cvs1:/tmp/cvs-serv17595
Modified Files:
common.php
Log Message:
no message
Index: common.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/common.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** common.php 18 Sep 2002 11:39:42 -0000 1.8
--- common.php 18 Sep 2002 23:41:18 -0000 1.9
***************
*** 38,42 ****
// ################# Include version info file ##############
! include(XOOPS_ROOT_PATH."/include/version.php");
// for older versions...will be DEPRECATED!
--- 38,42 ----
// ################# Include version info file ##############
! include_once(XOOPS_ROOT_PATH."/include/version.php");
// for older versions...will be DEPRECATED!
***************
*** 53,57 ****
set_magic_quotes_runtime(0);
// #################### Include global config files ##################
! include(XOOPS_ROOT_PATH."/modules/system/cache/config.php");
// ############## Include blocks construction class file ##############
--- 53,57 ----
set_magic_quotes_runtime(0);
// #################### Include global config files ##################
! include_once(XOOPS_ROOT_PATH."/modules/system/cache/config.php");
// ############## Include blocks construction class file ##############
***************
*** 60,66 ****
// #################### Include site-wide lang file ##################
if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php") ) {
! include(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php");
} else {
! include(XOOPS_ROOT_PATH."/language/english/global.php");
}
--- 60,66 ----
// #################### Include site-wide lang file ##################
if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php") ) {
! include_once(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/global.php");
} else {
! include_once(XOOPS_ROOT_PATH."/language/english/global.php");
}
***************
*** 68,74 ****
if ( isset($xoopsOption['pagetype']) ) {
if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php") ) {
! include(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php");
} else {
! include(XOOPS_ROOT_PATH."/language/english/".$xoopsOption['pagetype'].".php");
}
}
--- 68,74 ----
if ( isset($xoopsOption['pagetype']) ) {
if ( file_exists(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php") ) {
! include_once(XOOPS_ROOT_PATH."/language/".$xoopsConfig['language']."/".$xoopsOption['pagetype'].".php");
} else {
! include_once(XOOPS_ROOT_PATH."/language/english/".$xoopsOption['pagetype'].".php");
}
}
***************
*** 101,105 ****
// #################### Connect to DB ##################
if (defined('XOOPS_DB_PREFIX') && defined('XOOPS_DB_HOST') && defined('XOOPS_DB_USER') && defined('XOOPS_DB_PASS') && defined('XOOPS_DB_NAME')) {
! include(XOOPS_ROOT_PATH.'/class/'.XOOPS_DB_TYPE.'.php');
$xoopsDB =& Database::getInstance();
$xoopsDB->setPrefix(XOOPS_DB_PREFIX);
--- 101,105 ----
// #################### Connect to DB ##################
if (defined('XOOPS_DB_PREFIX') && defined('XOOPS_DB_HOST') && defined('XOOPS_DB_USER') && defined('XOOPS_DB_PASS') && defined('XOOPS_DB_NAME')) {
! include_once(XOOPS_ROOT_PATH.'/class/'.XOOPS_DB_TYPE.'.php');
$xoopsDB =& Database::getInstance();
$xoopsDB->setPrefix(XOOPS_DB_PREFIX);
***************
*** 118,122 ****
// ############## Include common functions file ##############
! include(XOOPS_ROOT_PATH."/include/functions.php");
--- 118,122 ----
// ############## Include common functions file ##############
! include_once(XOOPS_ROOT_PATH."/include/functions.php");
***************
*** 137,143 ****
$xoopsModule = XoopsModule::getByDirname($module_dir);
if ( !$xoopsModule || !$xoopsModule->isActivated() ) {
! include(XOOPS_ROOT_PATH."/header.php");
echo "<h4>"._MODULENOEXIST."</h4>";
! include(XOOPS_ROOT_PATH."/footer.php");
exit();
}
--- 137,143 ----
$xoopsModule = XoopsModule::getByDirname($module_dir);
if ( !$xoopsModule || !$xoopsModule->isActivated() ) {
! include_once(XOOPS_ROOT_PATH."/header.php");
echo "<h4>"._MODULENOEXIST."</h4>";
! include_once(XOOPS_ROOT_PATH."/footer.php");
exit();
}
***************
*** 154,161 ****
}
if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php") ) {
! include(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php");
} else {
if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php") ) {
! include(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php");
}
}
--- 154,161 ----
}
if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php") ) {
! include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/".$xoopsConfig['language']."/main.php");
} else {
if ( file_exists(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php") ) {
! include_once(XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/language/english/main.php");
}
}
|
|
From: <on...@us...> - 2002-09-18 23:39:19
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv17102
Modified Files:
install.php
Log Message:
no message
Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** install.php 18 Sep 2002 23:28:58 -0000 1.11
--- install.php 18 Sep 2002 23:39:16 -0000 1.12
***************
*** 58,62 ****
}
include_once("modules/system/cache/config.php");
! if ( file_exists("language/".$language."/global.php") ) {
include_once("language/".$language."/global.php");
} elseif ( file_exists("language/english/global.php") ) {
--- 58,62 ----
}
include_once("modules/system/cache/config.php");
! if ( file_exists('language/'.$language.'/global.php') ) {
include_once("language/".$language."/global.php");
} elseif ( file_exists("language/english/global.php") ) {
|
|
From: <on...@us...> - 2002-09-18 23:38:38
|
Update of /cvsroot/xoops/xoops-current/html/cache In directory usw-pr-cvs1:/tmp/cvs-serv16917/cache Log Message: Directory /cvsroot/xoops/xoops-current/html/cache added to the repository |
|
From: <on...@us...> - 2002-09-18 23:37:35
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv16698
Modified Files:
footer.php
Log Message:
no message
Index: footer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/footer.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** footer.php 18 Sep 2002 12:38:10 -0000 1.6
--- footer.php 18 Sep 2002 23:37:32 -0000 1.7
***************
*** 36,40 ****
}
}
! if ($xoopsConfig['debug']) {
$xoopsLogger->stopTime();
$xoopsLogger =& XoopsLogger::getInstance();
--- 36,40 ----
}
}
! if ($xoopsConfig['debug_mode']) {
$xoopsLogger->stopTime();
$xoopsLogger =& XoopsLogger::getInstance();
|
|
From: <on...@us...> - 2002-09-18 23:31:01
|
Update of /cvsroot/xoops/xoops-current/html/class In directory usw-pr-cvs1:/tmp/cvs-serv15297 Modified Files: mysql.php Log Message: no message Index: mysql.php =================================================================== RCS file: /cvsroot/xoops/xoops-current/html/class/mysql.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mysql.php 18 Sep 2002 16:27:47 -0000 1.4 --- mysql.php 18 Sep 2002 23:30:55 -0000 1.5 *************** *** 58,61 **** --- 58,62 ---- return false; } + return true; } |
|
From: <on...@us...> - 2002-09-18 23:29:05
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv14824
Modified Files:
install.php
Log Message:
no message
Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** install.php 18 Sep 2002 16:28:01 -0000 1.10
--- install.php 18 Sep 2002 23:28:58 -0000 1.11
***************
*** 283,291 ****
install_header();
echo "<div style='text-align:center'>";
! $xoops_root_path = XOOPS_ROOT_PATH;
! $xoops_url = XOOPS_URL;
! if ( $xoops_root_path == "/path/to/xoops/directory" || !defined("XOOPS_ROOT_PATH") || $xoops_url == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
echo "<table width=\"70%\"><tr><td>";
! if ( $xoops_root_path == "/path/to/xoops/directory" || !defined(XOOPS_ROOT_PATH) ) {
echo _INSTALL_L1."<br /><br />
<b>define(\"XOOPS_ROOT_PATH\",\"/path/to/xoops/directory\");</b><br /><br />
--- 283,289 ----
install_header();
echo "<div style='text-align:center'>";
! if ( XOOPS_ROOT_PATH == "/path/to/xoops/directory" || !defined("XOOPS_ROOT_PATH") || XOOPS_URL == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
echo "<table width=\"70%\"><tr><td>";
! if ( XOOPS_ROOT_PATH == "/path/to/xoops/directory" || !defined(XOOPS_ROOT_PATH) ) {
echo _INSTALL_L1."<br /><br />
<b>define(\"XOOPS_ROOT_PATH\",\"/path/to/xoops/directory\");</b><br /><br />
***************
*** 293,297 ****
<b>define(\"XOOPS_ROOT_PATH\",\"<span style='color:#ff0000;'>".str_replace("\\","/",getcwd())."\");</span></b><br /><br />";
}
! if ( $xoops_url == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
$filepath = (!empty($REQUEST_URI)) ? ($REQUEST_URI) : $SCRIPT_NAME;
printf(_INSTALL_L3, "<br /><br /><b>define(\"XOOPS_URL\",\"http://url_to_xoops_directory\");</b><br /><br />", "<br /><br /><b>define(\"XOOPS_URL\",\"<span style='color:#ff0000;'>http://".$HTTP_HOST."/".str_replace("/", "", dirname($filepath))."\");</span></b>");
--- 291,295 ----
<b>define(\"XOOPS_ROOT_PATH\",\"<span style='color:#ff0000;'>".str_replace("\\","/",getcwd())."\");</span></b><br /><br />";
}
! if (XOOPS_URL == "http://url_to_xoops_directory" || !defined("XOOPS_URL") ) {
$filepath = (!empty($REQUEST_URI)) ? ($REQUEST_URI) : $SCRIPT_NAME;
printf(_INSTALL_L3, "<br /><br /><b>define(\"XOOPS_URL\",\"http://url_to_xoops_directory\");</b><br /><br />", "<br /><br /><b>define(\"XOOPS_URL\",\"<span style='color:#ff0000;'>http://".$HTTP_HOST."/".str_replace("/", "", dirname($filepath))."\");</span></b>");
***************
*** 311,315 ****
echo _INSTALL_L12."<b>".XOOPS_URL."</b><br /><br />";
echo _INSTALL_L13."<br /><br />\n";
! } elseif ( $xoops_root_path != $detected ) {
echo "<p>\n";
echo "<span style='color: #ff0000'>"._INSTALL_L5."</span><br />";
--- 309,313 ----
echo _INSTALL_L12."<b>".XOOPS_URL."</b><br /><br />";
echo _INSTALL_L13."<br /><br />\n";
! } elseif ( XOOPS_ROOT_PATH != $detected ) {
echo "<p>\n";
echo "<span style='color: #ff0000'>"._INSTALL_L5."</span><br />";
***************
*** 336,340 ****
function install_init(){
install_header();
! if (XOOPS_DB_PREFIX == '' || XOOPS_DB_HOST = '' || !defined('XOOPS_DB_USER') || !defined('XOOPS_DB_PASS') || XOOPS_DB_NAME == '') {
echo "<div style='text-align:center'>\n";
echo _INSTALL_L15."<br /><br />\n";
--- 334,338 ----
function install_init(){
install_header();
! if (XOOPS_DB_PREFIX == '' || XOOPS_DB_HOST == '' || !defined('XOOPS_DB_USER') || !defined('XOOPS_DB_PASS') || XOOPS_DB_NAME == '') {
echo "<div style='text-align:center'>\n";
echo _INSTALL_L15."<br /><br />\n";
***************
*** 1168,1172 ****
include_once("mainfile.php");
install_header();
- include_once("include/config.php");
install_createDB();
break;
--- 1166,1169 ----
|
|
From: <on...@us...> - 2002-09-18 23:28:36
|
Update of /cvsroot/xoops/xoops-current/html/modules/system/cache In directory usw-pr-cvs1:/tmp/cvs-serv14717 Modified Files: config.php Log Message: no message Index: config.php =================================================================== RCS file: /cvsroot/xoops/xoops-current/html/modules/system/cache/config.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.php 23 Aug 2002 05:18:29 -0000 1.4 --- config.php 18 Sep 2002 23:28:31 -0000 1.5 *************** *** 74,78 **** // Enable debug mode? (Turn this on to display all SQL errors for debug only. A running website should have this turned off.) (1=Yes 0=No) ! $xoopsConfig['debug_mode'] = 1; // Default Comment Display Mode (0=No Comments flat=Flat thread=Threaded) --- 74,78 ---- // Enable debug mode? (Turn this on to display all SQL errors for debug only. A running website should have this turned off.) (1=Yes 0=No) ! $xoopsConfig['debug_mode'] = 0; // Default Comment Display Mode (0=No Comments flat=Flat thread=Threaded) |
|
From: <on...@us...> - 2002-09-18 20:02:03
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv6893
Modified Files:
header.php
Log Message:
no message
Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** header.php 18 Sep 2002 12:38:10 -0000 1.6
--- header.php 18 Sep 2002 20:02:00 -0000 1.7
***************
*** 46,50 ****
$xoopsTpl = new XoopsTpl();
$xoopsTpl->setCaching(2);
! if ($xoopsConfig['debug']) {
$xoopsTpl->setDebugging(true);
}
--- 46,50 ----
$xoopsTpl = new XoopsTpl();
$xoopsTpl->setCaching(2);
! if ($xoopsConfig['debug_mode'] == 1) {
$xoopsTpl->setDebugging(true);
}
|
|
From: <on...@us...> - 2002-09-18 16:34:22
|
Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv28230
Modified Files:
xoopsmodule.php
Log Message:
no message
Index: xoopsmodule.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopsmodule.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xoopsmodule.php 8 Aug 2002 16:02:39 -0000 1.2
--- xoopsmodule.php 18 Sep 2002 16:34:13 -0000 1.3
***************
*** 535,539 ****
function &mainLink(){
if ( $this->hasMain() ) {
! $ret = "<a href='".XOOPS_URL."/modules/".$this->dirname()."/'>".$this->name()."</a>";
return $ret;
}
--- 535,539 ----
function &mainLink(){
if ( $this->hasMain() ) {
! $ret = "<a href='\".XOOPS_URL.\"/modules/".$this->dirname()."/'>".$this->name()."</a>";
return $ret;
}
***************
*** 545,549 ****
if ( isset($this->modinfo['sub']) && is_array($this->modinfo['sub']) ) {
foreach ( $this->modinfo['sub'] as $submenu ) {
! $ret[] .= "<a href='".XOOPS_URL."/modules/".$this->dirname()."/".$submenu['url']."'>".$submenu['name']."</a>";
}
return $ret;
--- 545,549 ----
if ( isset($this->modinfo['sub']) && is_array($this->modinfo['sub']) ) {
foreach ( $this->modinfo['sub'] as $submenu ) {
! $ret[] .= "<a href='\".XOOPS_URL.\"/modules/".$this->dirname()."/".$submenu['url']."'>".$submenu['name']."</a>";
}
return $ret;
|
|
From: <on...@us...> - 2002-09-18 16:28:09
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv26151
Modified Files:
install.php
Log Message:
no message
Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** install.php 18 Sep 2002 13:58:25 -0000 1.9
--- install.php 18 Sep 2002 16:28:01 -0000 1.10
***************
*** 335,358 ****
function install_init(){
- global $xoopsConfig;
install_header();
! if($xoopsConfig[dbhost]=="" || $xoopsConfig[dbname] == "" || $xoopsConfig[prefix] =="" || !isset($xoopsConfig[dbhost]) || !isset($xoopsConfig[dbuname]) || !isset($xoopsConfig[dbpass]) || !isset($xoopsConfig[dbname]) || !isset($xoopsConfig[prefix])){
echo "<div style='text-align:center'>\n";
echo _INSTALL_L15."<br /><br />\n";
echo "<table width=\"70%\">\n";
! if($xoopsConfig[dbhost]=="" || !isset($xoopsConfig[dbhost])){
! echo "<tr><td>".sprintf(_INSTALL_L16, "<b>\$xoopsConfig['dbhost']</b>")."</td></tr>\n";
}
! if(!isset($xoopsConfig[dbuname])){
! echo "<tr><td>".sprintf(_INSTALL_L17, "<b>\$xoopsConfig['dbuname']</b>")."</td></tr>\n";
}
! if(!isset($xoopsConfig[dbpass])){
! echo "<tr><td>".sprintf(_INSTALL_L18, "<b>\$xoopsConfig['dbpass']</b>")."</td></tr>\n";
}
! if($xoopsConfig[dbname] == "" || !isset($xoopsConfig[dbname])){
! echo "<tr><td>".sprintf(_INSTALL_L19, "<b>\$xoopsConfig['dbname']</b>")."</td></tr>\n";
}
! if ( $xoopsConfig['prefix'] =="" || !isset($xoopsConfig['prefix']) ) {
! echo "<tr><td>".sprintf(_INSTALL_L20, "<b>\$xoopsConfig['prefix']</b>")."</td></tr>\n";
}
echo "</table>\n";
--- 335,357 ----
function install_init(){
install_header();
! if (XOOPS_DB_PREFIX == '' || XOOPS_DB_HOST = '' || !defined('XOOPS_DB_USER') || !defined('XOOPS_DB_PASS') || XOOPS_DB_NAME == '') {
echo "<div style='text-align:center'>\n";
echo _INSTALL_L15."<br /><br />\n";
echo "<table width=\"70%\">\n";
! if (XOOPS_DB_HOST=="") {
! echo "<tr><td>".sprintf(_INSTALL_L16, "<b>XOOPS_DB_HOST</b>")."</td></tr>\n";
}
! if(!defined(XOOPS_DB_USER)){
! echo "<tr><td>".sprintf(_INSTALL_L17, "<b>XOOPS_DB_USER</b>")."</td></tr>\n";
}
! if(!defined(XOOPS_DB_PASS)){
! echo "<tr><td>".sprintf(_INSTALL_L18, "<b>XOOPS_DB_PASS</b>")."</td></tr>\n";
}
! if (XOOPS_DB_NAME == "") {
! echo "<tr><td>".sprintf(_INSTALL_L19, "<b>XOOPS_DB_NAME</b>")."</td></tr>\n";
}
! if (XOOPS_DB_PREFIX == "") {
! echo "<tr><td>".sprintf(_INSTALL_L20, "<b>XOOPS_DB_PREFIX</b>")."</td></tr>\n";
}
echo "</table>\n";
***************
*** 361,369 ****
exit();
}
! $xoopsDB = new Database();
! $xoopsDB->setPrefix($xoopsConfig['prefix']);
! if ( !$xoopsDB->connect($xoopsConfig['dbhost'], $xoopsConfig['dbuname'], $xoopsConfig['dbpass'], $xoopsConfig['dbname'], $xoopsConfig['db_pconnect']) ) {
echo "<div><p>"._INSTALL_L21."<br /><br />";
! echo "<b>".$xoopsConfig['dbname']."</b></p>";
echo "<p>"._INSTALL_L22."</p>";
echo "<form action='install.php' method='post'>";
--- 360,367 ----
exit();
}
! $xoopsDB =& Database::getInstance();
! if (get_class($xoopsDB) != 'database') {
echo "<div><p>"._INSTALL_L21."<br /><br />";
! echo "<b>".XOOPS_DB_NAME."</b></p>";
echo "<p>"._INSTALL_L22."</p>";
echo "<form action='install.php' method='post'>";
***************
*** 373,387 ****
install_footer();
exit();
! }
! $xoopsDB->close();
echo "<table width=\"60%\" align=\"center\">\n";
echo "<tr><td>"._INSTALL_L25."<br /><br />\n";
echo "<b>"._INSTALL_L26."</b><br /><br />\n";
! echo " "._INSTALL_L27." <b>".$xoopsConfig[dbhost]."</b><br />\n";
! echo " "._INSTALL_L28." <b>".$xoopsConfig[dbuname]."</b><br />\n";
! echo " "._INSTALL_L29." <b>".$xoopsConfig[dbname]."</b><br />\n";
! echo " "._INSTALL_L30." <b>".$xoopsConfig[prefix]."</b><br /><br />\n";
! //echo "<b>Site Configuration</b><br /><br />\n";
! //echo " URL (Virtual Path): <b>".$xoopsConfig[xoops_url]."</b><br /><br />\n";
echo "</td></tr><tr><td align=\"center\"><form action=\"install.php\" method=\"post\">\n";
echo _INSTALL_L13."<br /><br />\n";
--- 371,382 ----
install_footer();
exit();
! }
echo "<table width=\"60%\" align=\"center\">\n";
echo "<tr><td>"._INSTALL_L25."<br /><br />\n";
echo "<b>"._INSTALL_L26."</b><br /><br />\n";
! echo " "._INSTALL_L27." <b>".XOOPS_DB_HOST."</b><br />\n";
! echo " "._INSTALL_L28." <b>".XOOPS_DB_USER."</b><br />\n";
! echo " "._INSTALL_L29." <b>".XOOPS_DB_NAME."</b><br />\n";
! echo " "._INSTALL_L30." <b>".XOOPS_DB_PREFIX."</b><br /><br />\n";
echo "</td></tr><tr><td align=\"center\"><form action=\"install.php\" method=\"post\">\n";
echo _INSTALL_L13."<br /><br />\n";
***************
*** 394,400 ****
function install_createDB(){
! global $xoopsConfig;
! mysql_connect($xoopsConfig['dbhost'], $xoopsConfig['dbuname'], $xoopsConfig['dbpass']);
! $result = mysql_query("CREATE DATABASE ".$xoopsConfig['dbname']."");
if ( !$result ) {
echo "<div><b>"._INSTALL_L31."</b></div>";
--- 389,394 ----
function install_createDB(){
! mysql_connect(XOOPS_DB_HOST, XOOPS_DB_USER, XOOPS_DB_PASS);
! $result = mysql_query("CREATE DATABASE ".XOOPS_DB_NAME);
if ( !$result ) {
echo "<div><b>"._INSTALL_L31."</b></div>";
***************
*** 402,406 ****
exit();
}
! echo "<div><b>".sprintf(_INSTALL_L43, $xoopsConfig['dbname'])."</b>";
echo "<form action='install.php' method='post'>";
echo "<input type='hidden' name='op' value='initial' />";
--- 396,400 ----
exit();
}
! echo "<div><b>".sprintf(_INSTALL_L43, XOOPS_DB_NAME)."</b>";
echo "<form action='install.php' method='post'>";
echo "<input type='hidden' name='op' value='initial' />";
|
|
From: <on...@us...> - 2002-09-18 16:27:56
|
Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv26078
Modified Files:
mysql.php
Log Message:
no message
Index: mysql.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/mysql.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mysql.php 18 Sep 2002 11:00:23 -0000 1.3
--- mysql.php 18 Sep 2002 16:27:47 -0000 1.4
***************
*** 35,39 ****
$instance = new Database();
$instance->setLogger(XoopsLogger::getInstance());
! $instance->connect();
}
return $instance;
--- 35,41 ----
$instance = new Database();
$instance->setLogger(XoopsLogger::getInstance());
! if (!$instance->connect()) {
! return false;
! }
}
return $instance;
***************
*** 48,51 ****
--- 50,54 ----
if (!$this->conn) {
$this->logger->addQuery($sql, $this->error(), $this->errno());
+ return false;
}
***************
*** 53,56 ****
--- 56,60 ----
if (!$selDB) {
$this->logger->addQuery($sql, $this->error(), $this->errno());
+ return false;
}
}
|
|
From: <w4...@us...> - 2002-09-18 14:41:49
|
Update of /cvsroot/xoops/xoops-current/html/modules/newbb/language/spanish
In directory usw-pr-cvs1:/tmp/cvs-serv32044/html/modules/newbb/language/spanish
Modified Files:
main.php
Log Message:
no comment
Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/newbb/language/spanish/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.php 23 Aug 2002 13:31:36 -0000 1.3
--- main.php 18 Sep 2002 14:41:47 -0000 1.4
***************
*** 62,66 ****
define("_MD_TOPICSTICKY","Tema está Pegado");
define("_MD_TOPICLOCKED","Tema Bloqueado (No pueden realizarse nuevos envíos)");
! define("_MD_NEXTPAGE","<img border='0' src='\images\\right.gif' alt='Página Siguiente'> ");
define("_MD_SORTEDBY","ordenado por");
define("_MD_TOPICTITLE","Título del tema");
--- 62,66 ----
define("_MD_TOPICSTICKY","Tema está Pegado");
define("_MD_TOPICLOCKED","Tema Bloqueado (No pueden realizarse nuevos envíos)");
! define("_MD_NEXTPAGE","<img border='0' src='/images/right.gif' alt='Página Siguiente' /> ");
define("_MD_SORTEDBY","ordenado por");
define("_MD_TOPICTITLE","Título del tema");
***************
*** 94,98 ****
define("_MD_REGCANPOST","Todos los Usuarios <b>Registrados</b> pueden enviar nuevos temas y responder en este Foro");
define("_MD_MODSCANPOST","Solo <B>Moderadores y Administradores</b> pueden enviar nuevos temas y responder en este Foro");
! define("_MD_PREVPAGE"," <img border='0' src='\images\left.gif' alt='Página Anterior'>");
define("_MD_QUOTE","Acotar");
--- 94,98 ----
define("_MD_REGCANPOST","Todos los Usuarios <b>Registrados</b> pueden enviar nuevos temas y responder en este Foro");
define("_MD_MODSCANPOST","Solo <B>Moderadores y Administradores</b> pueden enviar nuevos temas y responder en este Foro");
! define("_MD_PREVPAGE"," <img border='0' src='/images/left.gif' alt='Página Anterior' />");
define("_MD_QUOTE","Acotar");
|
|
From: <on...@us...> - 2002-09-18 13:58:29
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv16176
Modified Files:
install.php
Log Message:
no message
Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.php 18 Sep 2002 13:07:47 -0000 1.8
--- install.php 18 Sep 2002 13:58:25 -0000 1.9
***************
*** 228,256 ****
// "._INSTALL_L51."
// "._INSTALL_L66."
! \$xoopsConfig['database'] = \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($database))."\";
// "._INSTALL_L30."
// "._INSTALL_L63."
! \$xoopsConfig['prefix'] = \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($prefix))."\";
// "._INSTALL_L27."
// "._INSTALL_L67."
! \$xoopsConfig['dbhost'] = \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbhost))."\";
// "._INSTALL_L28."
// "._INSTALL_L65."
! \$xoopsConfig['dbuname'] = \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbuname))."\";
// "._INSTALL_L52."
// "._INSTALL_L68."
! \$xoopsConfig['dbpass'] = \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbpass))."\";
// "._INSTALL_L29."
// "._INSTALL_L64."
! \$xoopsConfig['dbname'] = \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbname))."\";
// "._INSTALL_L54." ("._INSTALL_L23."=1 "._INSTALL_L24."=0)
// "._INSTALL_L69."
! \$xoopsConfig['db_pconnect'] = ".intval($db_pconnect).";
include(XOOPS_ROOT_PATH.\"/include/common.php\");
--- 228,256 ----
// "._INSTALL_L51."
// "._INSTALL_L66."
! define(\"XOOPS_DB_TYPE\", \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($database))."\");
// "._INSTALL_L30."
// "._INSTALL_L63."
! define(\"XOOPS_DB_PREFIX\", \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($prefix))."\");
// "._INSTALL_L27."
// "._INSTALL_L67."
! define(\"XOOPS_DB_HOST\", \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbhost))."\");
// "._INSTALL_L28."
// "._INSTALL_L65."
! define(\"XOOPS_DB_USER\", \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbuname))."\");
// "._INSTALL_L52."
// "._INSTALL_L68."
! define(\"XOOPS_DB_PASS\", \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbpass))."\");
// "._INSTALL_L29."
// "._INSTALL_L64."
! define(\"XOOPS_DB_NAME\", \"".$myts->oopsHtmlSpecialChars($myts->oopsAddSlashes($dbname))."\");
// "._INSTALL_L54." ("._INSTALL_L23."=1 "._INSTALL_L24."=0)
// "._INSTALL_L69."
! define(\"XOOPS_DB_PCONNECT\", \"".intval($db_pconnect)."\");
include(XOOPS_ROOT_PATH.\"/include/common.php\");
|
|
From: <on...@us...> - 2002-09-18 13:07:50
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv31156
Modified Files:
install.php
Log Message:
no message
Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** install.php 18 Sep 2002 12:35:02 -0000 1.7
--- install.php 18 Sep 2002 13:07:47 -0000 1.8
***************
*** 964,967 ****
--- 964,995 ----
#
+ # Table structure for table 'block_module_link'
+ #
+
+ $result = $xoopsDB->queryF("CREATE TABLE ".$xoopsDB->prefix("block_module_link")." (
+ block_id int(5) unsigned NOT NULL default '0',
+ module_id int(5) NOT NULL default '0',
+ KEY module_id (module_id),
+ KEY block_id (block_id)
+ )");
+ if(!$result){
+ for($i=0;$i<sizeof($madetables);$i++){
+ $xoopsDB->queryF("DROP table ".$madetables[$i]."");
+ }
+ die ("<b>".sprintf(_INSTALL_L44, $xoopsDB->prefix("block_module_link"))."</b>");
+ }else{
+ array_push($madetables, $xoopsDB->prefix("block_module_link"));
+ }
+ #
+ # Dumping data for table 'block_module_link'
+ #
+ $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix("block_module_link")." VALUES (1,0)");
+ $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix("block_module_link")." VALUES (2,0)");
+ $result = $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix("block_module_link")." VALUES (5,0)");
+
+
+ # --------------------------------------------------------
+
+ #
# Table structure for table 'stories'
#
|
|
From: <on...@us...> - 2002-09-18 12:38:13
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv20797
Modified Files:
header.php footer.php
Log Message:
no message
Index: header.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/header.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** header.php 6 Sep 2002 03:20:02 -0000 1.5
--- header.php 18 Sep 2002 12:38:10 -0000 1.6
***************
*** 18,22 ****
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
! //ss_timing_start();
if ( !defined("XOOPS_HEADER_INCLUDED") ) {
define("XOOPS_HEADER_INCLUDED",1);
--- 18,22 ----
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
// ------------------------------------------------------------------------- //
!
if ( !defined("XOOPS_HEADER_INCLUDED") ) {
define("XOOPS_HEADER_INCLUDED",1);
***************
*** 43,53 ****
} else {
// include Smarty template engine and initialize it
! require_once(SMARTY_DIR."Smarty.class.php");
! $xoopsTpl = new Smarty();
! //$xoopsTpl->caching = 2;
! //$xoopsTpl->debugging = true;
! //$xoopsTpl->cache_dir = XOOPS_ROOT_PATH.'/cache';
! $xoopsTpl->compile_dir = XOOPS_ROOT_PATH.'/templates_c';
! $xoopsTpl->template_dir = XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'];
$theme_css = getcss($xoopsConfig['default_theme']);
if ( $theme_css != '' ) {
--- 43,55 ----
} else {
// include Smarty template engine and initialize it
! require_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');
! $xoopsTpl = new XoopsTpl();
! $xoopsTpl->setCaching(2);
! if ($xoopsConfig['debug']) {
! $xoopsTpl->setDebugging(true);
! }
! $xoopsTpl->setCacheDir(XOOPS_ROOT_PATH.'/cache');
! $xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
! $xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
$theme_css = getcss($xoopsConfig['default_theme']);
if ( $theme_css != '' ) {
***************
*** 69,98 ****
}
// display right blocks?
! $xoopsOption['show_rblock'] = (!empty($xoopsOption['show_rblock'])) ? $xoopsOption['show_rblock'] : 0;
! $xoopsTpl->assign('xoops_showrblock', $xoopsOption['show_rblock']);
// get all blocks and assign to smarty
$xoopsblock = new XoopsBlock();
$arr = array();
- if ( $xoopsOption['show_rblock'] == 1 ) {
- $side = XOOPS_SIDEBLOCK_BOTH;
- } else {
- $side = XOOPS_SIDEBLOCK_LEFT;
- }
if ( $xoopsUser ) {
! $arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
} else {
! $arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
}
$block_count = count($arr);
for ($i = 0; $i < $block_count; $i++) {
! $block =& $arr[$i]->buildBlock();
! if ( $block ) {
! if ( XOOPS_SIDEBLOCK_LEFT == $arr[$i]->getVar('side') ) {
! $xoopsTpl->append('xoops_lblocks', array('title' => $block['title'], 'content' => $block['content']));
} else {
! $xoopsTpl->append('xoops_rblocks', array('title' => $block['title'], 'content' => $block['content']));
}
}
! unset($block);
}
// set some header variables
--- 71,162 ----
}
// display right blocks?
! //$xoopsOption['show_rblock'] = (!empty($xoopsOption['show_rblock'])) ? $xoopsOption['show_rblock'] : 0;
! //$xoopsTpl->assign('xoops_showrblock', $xoopsOption['show_rblock']);
// get all blocks and assign to smarty
$xoopsblock = new XoopsBlock();
$arr = array();
if ( $xoopsUser ) {
! if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
! if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == $xoopsModule->dirname()) {
! $arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $xoopsModule->mid(), true, XOOPS_BLOCK_VISIBLE);
! } else {
! $arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), $xoopsModule->mid(), false, XOOPS_BLOCK_VISIBLE);
! }
! } else {
! if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == 'none') {
! $arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), 0, true, XOOPS_BLOCK_VISIBLE);
! } else {
! $arr =& $xoopsblock->getAllByGroupModule($xoopsUser->getGroups(), 0, false, XOOPS_BLOCK_VISIBLE);
! }
! }
} else {
! if ( isset($xoopsModule) && get_class($xoopsModule) == 'xoopsmodule' ) {
! if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == $xoopsModule->dirname()) {
! $arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), $xoopsModule->mid(), true, XOOPS_BLOCK_VISIBLE);
! } else {
! $arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), $xoopsModule->mid(), false, XOOPS_BLOCK_VISIBLE);
! }
! } else {
! if (preg_match("/index\.php$/i", $GLOBALS['PHP_SELF']) && $xoopsConfig['startpage'] == 'none') {
! $arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), 0, true, XOOPS_BLOCK_VISIBLE);
! } else {
! $arr =& $xoopsblock->getAllByGroupModule(XoopsGroup::getByType('Anonymous'), 0, false, XOOPS_BLOCK_VISIBLE);
! }
! }
}
$block_count = count($arr);
for ($i = 0; $i < $block_count; $i++) {
! $btemplate = $arr[$i]->getVar('btemplate');
! $btemplate = ($btemplate == '') ? 'block1.html' : $btemplate;
! $bcachetime = intval($arr[$i]->getVar('bcachetime'));
! if (!$xoopsTpl->is_cached('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $arr[$i]->getVar('bid'))) {
! $xoopsLogger->addBlock($arr[$i]->getVar('name'));
! $block =& $arr[$i]->buildBlock();
! if ($block) {
! $xoopsTpl->assign_by_ref('xoops_block', $block);
} else {
! continue;
}
+ unset($block);
+ } else {
+ $xoopsLogger->addBlock($arr[$i]->getVar('name'), true, $bcachetime);
}
! $xoopsTpl->cache_lifetime = $bcachetime;
! $fetched = $xoopsTpl->fetch('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $arr[$i]->getVar('bid'));
! switch ($arr[$i]->getVar('side')) {
! case XOOPS_SIDEBLOCK_LEFT:
! $xoopsTpl->append_by_ref('xoops_lblocks', $fetched);
! break;
! case XOOPS_CENTERBLOCK_LEFT:
! if (!isset($show_cblock)) {
! $xoopsTpl->assign('xoops_showcblock', 1);
! $show_cblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_clblocks', $fetched);
! break;
! case XOOPS_CENTERBLOCK_RIGHT:
! if (!isset($show_cblock)) {
! $xoopsTpl->assign('xoops_showcblock', 1);
! $show_cblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_crblocks', $fetched);
! break;
! case XOOPS_CENTERBLOCK_CENTER:
! if (!isset($show_cblock)) {
! $xoopsTpl->assign('xoops_showcblock', 1);
! $show_cblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_ccblocks', $fetched);
! break;
! case XOOPS_SIDEBLOCK_RIGHT:
! if (!isset($show_rblock)) {
! $xoopsTpl->assign('xoops_showrblock', 1);
! $show_rblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_rblocks', $fetched);
! break;
! }
! $xoopsTpl->assign_by_ref($arr[$i]->getVar('balias'), $fetched);
! unset($fetched);
}
// set some header variables
Index: footer.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/footer.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** footer.php 5 Sep 2002 11:10:36 -0000 1.5
--- footer.php 18 Sep 2002 12:38:10 -0000 1.6
***************
*** 9,16 ****
}
themefooter($xoopsOption['show_rblock'], $footer);
- //echo "<div style='font-size: smaller;'>\n";
- //ss_timing_stop();
- //printf("Page took %s seconds to load.",ss_timing_current());
- //echo "</div>\n";
xoops_footer();
} else {
--- 9,12 ----
***************
*** 35,46 ****
}
}
! //$cache = !empty($xoopsContentsTplCache) ? intval($xoopsContentsTplCache) : 0;
! //$xoopsTpl->cache_lifetime = $cache;
$xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch($xoopsContentsTpl));
}
}
$xoopsTpl->assign('xoops_footer', $footer);
header ('Content-Type:text/html; charset='._CHARSET);
! //$xoopsTpl->cache_lifetime = 0;
$xoopsTpl->display('layout.html');
}
--- 31,47 ----
}
}
! $cache = !empty($xoopsContentsTplCache) ? intval($xoopsContentsTplCache) : 0;
! $xoopsTpl->cache_lifetime = $cache;
$xoopsTpl->assign('xoops_contents', $xoopsTpl->fetch($xoopsContentsTpl));
}
}
+ if ($xoopsConfig['debug']) {
+ $xoopsLogger->stopTime();
+ $xoopsLogger =& XoopsLogger::getInstance();
+ $footer .= $xoopsLogger->dumpAll();
+ }
$xoopsTpl->assign('xoops_footer', $footer);
header ('Content-Type:text/html; charset='._CHARSET);
! $xoopsTpl->cache_lifetime = 0;
$xoopsTpl->display('layout.html');
}
|
|
From: <on...@us...> - 2002-09-18 12:35:05
|
Update of /cvsroot/xoops/xoops-current/html
In directory usw-pr-cvs1:/tmp/cvs-serv19939
Modified Files:
install.php
Log Message:
no message
Index: install.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/install.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** install.php 23 Aug 2002 05:17:57 -0000 1.6
--- install.php 18 Sep 2002 12:35:02 -0000 1.7
***************
*** 676,679 ****
--- 676,682 ----
show_func VARCHAR(50) NOT NULL DEFAULT '',
edit_func VARCHAR(50) NOT NULL DEFAULT '',
+ btemplate varchar(50) NOT NULL default '',
+ bcachetime int(10) NOT NULL default '0',
+ balias varchar(50) NOT NULL default '',
PRIMARY KEY (`bid`),
KEY `mid` (`mid`),
***************
*** 694,707 ****
#
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (1, 1, 1, '', 'User Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_user_show', '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (2, 1, 2, '', 'Login Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_login_show', '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (3, 1, 3, '', 'Search Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_search_show', '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (4, 1, 4, '', 'Waiting Contents Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_waiting_show', '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (5, 1, 5, '', 'Main Menu Block', 0, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_main_show', '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (6, 1, 6, '320|250|poweredby.gif', 'Site Info Block', 0, '', '', 0, 1, 1, 'S', 'H', 1, 'system', 'system_blocks.php', 'b_system_info_show', 'b_system_info_edit')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (7, 2, 1, '', 'News Topics Block', 0, '', '', 0, 0, 1, 'M', '', 1, 'news', 'news_topics.php', 'b_news_topics_show', '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (8, 2, 2, '', 'Big Story Block', 0, '', '', 1, 0, 1, 'M', '', 1, 'news', 'news_bigstory.php', 'b_news_bigstory_show', '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (9, 2, 3, 'counter|10', 'Top News Block', 0, '', '', 4, 0, 1, 'M', 'H', 1, 'news', 'news_top.php', 'b_news_top_show', 'b_news_top_edit')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (10, 2, 4, 'published|10', 'Recent News Block', 0, '', '', 3, 0, 1, 'M', 'H', 1, 'news', 'news_top.php', 'b_news_top_show', 'b_news_top_edit')");
--- 697,710 ----
#
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (1, 1, 1, '', 'User Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_user_show', '', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (2, 1, 2, '', 'Login Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_login_show', '', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (3, 1, 3, '', 'Search Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_search_show', '', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (4, 1, 4, '', 'Waiting Contents Block', 1, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_waiting_show', '', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (5, 1, 5, '', 'Main Menu Block', 0, '', '', 0, 0, 1, 'S', '', 1, 'system', 'system_blocks.php', 'b_system_main_show', '', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (6, 1, 6, '320|250|poweredby.gif', 'Site Info Block', 0, '', '', 0, 1, 1, 'S', 'H', 1, 'system', 'system_blocks.php', 'b_system_info_show', 'b_system_info_edit', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (7, 2, 1, '', 'News Topics Block', 0, '', '', 0, 0, 1, 'M', '', 1, 'news', 'news_topics.php', 'b_news_topics_show', '', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (8, 2, 2, '', 'Big Story Block', 0, '', '', 1, 0, 1, 'M', '', 1, 'news', 'news_bigstory.php', 'b_news_bigstory_show', '', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (9, 2, 3, 'counter|10', 'Top News Block', 0, '', '', 4, 0, 1, 'M', 'H', 1, 'news', 'news_top.php', 'b_news_top_show', 'b_news_top_edit', '', 0, '')");
! $xoopsDB->queryF("INSERT INTO ".$xoopsDB->prefix(newblocks)." VALUES (10, 2, 4, 'published|10', 'Recent News Block', 0, '', '', 3, 0, 1, 'M', 'H', 1, 'news', 'news_top.php', 'b_news_top_show', 'b_news_top_edit', '', 0, '')");
|
|
From: <on...@us...> - 2002-09-18 12:23:54
|
Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin
In directory usw-pr-cvs1:/tmp/cvs-serv16672
Modified Files:
main.php blocksadmin.php
Log Message:
no message
Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/main.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.php 15 Jul 2002 08:13:44 -0000 1.1.1.1
--- main.php 18 Sep 2002 12:23:51 -0000 1.2
***************
*** 18,23 ****
if ( $op == "list" ) {
xoops_cp_header();
! list_blocks();
! xoops_cp_footer();
exit();
}
--- 18,23 ----
if ( $op == "list" ) {
xoops_cp_header();
! list_blocks();
! xoops_cp_footer();
exit();
}
***************
*** 34,45 ****
if ( $op == "save" ) {
! save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype);
exit();
}
if ( $op == "update" ) {
! update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $bcontent, $bctype, $options);
! exit();
}
if ( $op == "delete_ok" ) {
--- 34,45 ----
if ( $op == "save" ) {
! save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $balias, $bcachetime, $bmodule);
exit();
}
if ( $op == "update" ) {
! update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $balias, $bcachetime, $bmodule, $options);
}
+
if ( $op == "delete_ok" ) {
Index: blocksadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/blocksadmin/blocksadmin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** blocksadmin.php 4 Aug 2002 19:59:24 -0000 1.2
--- blocksadmin.php 18 Sep 2002 12:23:51 -0000 1.3
***************
*** 1,39 ****
<?php
// $Id$
! if ( !eregi("admin.php", $PHP_SELF) ) {
! die ("Access Denied");
}
// check if the user is authorised
if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
! include_once(XOOPS_ROOT_PATH."/class/xoopsblock.php");
function list_blocks(){
! global $xoopsUser;
! OpenTable();
echo "
<h4 style='text-align:left;'>"._AM_BADMIN."</h4>
! <form action='admin.php' name='blockadmin' id='blockadmin' method='post' style='position:relative;z-index:3'><b>"._AM_SIDEBADMIN."</b><br />
! <table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>
<table width='100%' border='0' cellpadding='4' cellspacing='1'>
<tr valign='middle' class='bg3'><td width='20%'><b>"._AM_BLKDESC."</b></td><td width='20%'><b>"._AM_TITLE."</b></td><td><b>"._AM_SIDE."</b></td><td align='center'><b>"._AM_WEIGHT."</b></td><td align='center'><b>"._AM_VISIBLE."</b></td><td align='right'><b>"._AM_ACTION."</b></td></tr>
";
$arr =& XoopsBlock::getAllBlocks("object", XOOPS_SIDEBLOCK_BOTH);
! foreach ( $arr as $ele ) {
! show_block($ele);
}
echo "
! </table></td></tr></table>
<br />
<b>"._AM_CENTERBADMIN."</b><br />
- <table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>
<table width='100%' border='0' cellpadding='4' cellspacing='1'>
<tr valign='middle' class='bg3'><td width='20%'><b>"._AM_BLKDESC."</b></td><td width='20%'><b>"._AM_TITLE."</b></td><td><b>"._AM_SIDE."</b></td><td align='center'><b>"._AM_WEIGHT."</b></td><td align='center'><b>"._AM_VISIBLE."</b></td><td align='right'><b>"._AM_ACTION."</b></td></tr>
";
$arr =& XoopsBlock::getAllBlocks("object", XOOPS_CENTERBLOCK_ALL);
! foreach($arr as $ele){
! show_block($ele);
}
echo "
! </table></td></tr></table><br /><div>
<input type='hidden' name='fct' value='blocksadmin' />
<input type='hidden' name='op' value='order' />
--- 1,41 ----
<?php
// $Id$
! if ( !eregi('admin.php', $PHP_SELF) ) {
! die ('Access Denied');
}
// check if the user is authorised
if ( $xoopsUser->isAdmin($xoopsModule->mid()) ) {
! include_once(XOOPS_ROOT_PATH.'/class/xoopsblock.php');
function list_blocks(){
! global $xoopsUser, $xoopsConfig;
! include_once(XOOPS_ROOT_PATH.'/class/xoopslists.php');
! //OpenTable();
echo "
<h4 style='text-align:left;'>"._AM_BADMIN."</h4>
! <form action='admin.php' name='blockadmin' id='blockadmin' method='post'><b>"._AM_SIDEBADMIN."</b><br />
!
<table width='100%' border='0' cellpadding='4' cellspacing='1'>
<tr valign='middle' class='bg3'><td width='20%'><b>"._AM_BLKDESC."</b></td><td width='20%'><b>"._AM_TITLE."</b></td><td><b>"._AM_SIDE."</b></td><td align='center'><b>"._AM_WEIGHT."</b></td><td align='center'><b>"._AM_VISIBLE."</b></td><td align='right'><b>"._AM_ACTION."</b></td></tr>
";
$arr =& XoopsBlock::getAllBlocks("object", XOOPS_SIDEBLOCK_BOTH);
! $block_count = count($arr);
! for ($i = 0; $i < $block_count; $i++) {
! show_block($arr[$i]);
}
echo "
! </table>
<br />
<b>"._AM_CENTERBADMIN."</b><br />
<table width='100%' border='0' cellpadding='4' cellspacing='1'>
<tr valign='middle' class='bg3'><td width='20%'><b>"._AM_BLKDESC."</b></td><td width='20%'><b>"._AM_TITLE."</b></td><td><b>"._AM_SIDE."</b></td><td align='center'><b>"._AM_WEIGHT."</b></td><td align='center'><b>"._AM_VISIBLE."</b></td><td align='right'><b>"._AM_ACTION."</b></td></tr>
";
$arr =& XoopsBlock::getAllBlocks("object", XOOPS_CENTERBLOCK_ALL);
! $block_count = count($arr);
! for ($i = 0; $i < $block_count; $i++) {
! show_block($arr[$i]);
}
echo "
! </table><br /><div>
<input type='hidden' name='fct' value='blocksadmin' />
<input type='hidden' name='op' value='order' />
***************
*** 46,50 ****
<h4 style='text-align:left;'>" ._AM_ADDBLOCK."</h4>
<form action='admin.php?fct=blocksadmin' method='post'>
- <table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>
<table width='100%' border='0' cellpadding='4' cellspacing='1'>
<tr align='left' valign='top'><td class='bg3' width='30%'>
--- 48,51 ----
***************
*** 69,73 ****
<option value='1' selected='selected'>" ._AM_YES."</option>
</select>
! </td></tr><tr align='left' valign='top'><td class='bg3'>
<b>" ._AM_TITLE."</b>
</td><td class='bg1'>
--- 70,81 ----
<option value='1' selected='selected'>" ._AM_YES."</option>
</select>
! </td></tr>";
! echo '<tr><td class="bg3" valign="top"><b>'._AM_VISIBLEIN.'</b></td><td class="bg1"><select size="5" name="bmodule[]" multiple="multiple"><option value="-1">'._AM_TOPONLY.'</option><option value="0">'._AM_ALLPAGES.'</option>';
! $module_list =& XoopsModule::getHasMainModulesList();
! foreach ($module_list as $k => $v) {
! echo '<option value="'.$k.'">'.$v.'</option>';
! }
! echo '</select></td></tr>';
! echo "<tr align='left' valign='top'><td class='bg3'>
<b>" ._AM_TITLE."</b>
</td><td class='bg1'>
***************
*** 86,98 ****
<option value='T' selected='selected'>" ._AM_AFNOSMILE."</option>
</select>
! </td></tr>
<tr align='left' valign='top'><td class='bg3'> </td>
<td class='bg1'>
<input type='hidden' name='op' value='save' />
<input type='submit' value='" ._AM_SUBMIT."' />
! </td></tr></table></td></tr></table>
</form>
";
! CloseTable();
}
--- 94,120 ----
<option value='T' selected='selected'>" ._AM_AFNOSMILE."</option>
</select>
! </td></tr>";
! if (!is_dir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks')) {
! $block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/xoops/blocks');
! } else {
! $block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks');
! }
! echo '<tr valign="top"><td class="bg3"><b>'._AM_BTEMPLATE.'</b></td><td class="bg1"><select name="btemplate">';
! foreach ($block_templates as $key => $value) {
! echo '<option value="'.$key.'">'.$value.'</option>';
! }
! echo '</select></td></tr>';
! echo '<tr valign="top"><td class="bg3"><b>'._AM_ADVANCED.'</b></td><td class="bg1">'._AM_BCACHETIME.' <input type="text" name="bcachetime" size="10" maxlength="10" value="0" />';
! //echo '<br />'._AM_BALIAS.' <input type="text" name="balias" size="50" maxlength="50" value="" />';
! echo '</td></tr>';
! echo "
<tr align='left' valign='top'><td class='bg3'> </td>
<td class='bg1'>
<input type='hidden' name='op' value='save' />
<input type='submit' value='" ._AM_SUBMIT."' />
! </td></tr></table>
</form>
";
! //CloseTable();
}
***************
*** 125,155 ****
}
echo "
! <input type='hidden' name='oldside[]' value='".$ele->getVar("side")."' />
! <input type='hidden' name='oldweight[]' value='".$ele->getVar("weight")."' />
! <input type='hidden' name='oldvisible[]' value='".$ele->getVar("visible")."' />
! <input type='hidden' name='bid[]' value='".$ele->getVar("bid")."' />
</td></tr>
";
}
! function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype){
$myblock = new XoopsBlock();
! $myblock->setVar("side", $bside);
! $myblock->setVar("weight", $bweight);
! //$myblock->setVar("position", $bposition);
! $myblock->setVar("visible", $bvisible);
! $myblock->setVar("weight", $bweight);
! $myblock->setVar("title", $btitle);
! $myblock->setVar("content", $bcontent);
! $myblock->setVar("c_type", $bctype);
! $myblock->setVar("type", "C");
switch ($bctype) {
! case "H":
$name = _AM_CUSTOMHTML;
break;
! case "P":
$name = _AM_CUSTOMPHP;
break;
! case "S":
$name = _AM_CUSTOMSMILE;
break;
--- 147,181 ----
}
echo "
! <input type='hidden' name='oldside[]' value='".$ele->getVar('side')."' />
! <input type='hidden' name='oldweight[]' value='".$ele->getVar('weight')."' />
! <input type='hidden' name='oldvisible[]' value='".$ele->getVar('visible')."' />
! <input type='hidden' name='bid[]' value='".$ele->getVar('bid')."' />
</td></tr>
";
}
! function save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $btemplate, $balias, $bcachetime, $bmodule){
! global $xoopsUser;
$myblock = new XoopsBlock();
! $myblock->setVar('side', $bside);
! $myblock->setVar('weight', $bweight);
! //$myblock->setVar('position', $bposition);
! $myblock->setVar('visible', $bvisible);
! $myblock->setVar('weight', $bweight);
! $myblock->setVar('title', $btitle);
! $myblock->setVar('content', $bcontent);
! $myblock->setVar('c_type', $bctype);
! $myblock->setVar('type', 'C');
! $myblock->setVar('btemplate', $btemplate);
! $myblock->setVar('balias', $balias);
! $myblock->setVar('bcachetime', $bcachetime);
switch ($bctype) {
! case 'H':
$name = _AM_CUSTOMHTML;
break;
! case 'P':
$name = _AM_CUSTOMPHP;
break;
! case 'S':
$name = _AM_CUSTOMSMILE;
break;
***************
*** 158,163 ****
break;
}
! $myblock->setVar("name", $name);
! if ( !$myblock->store() ) {
xoops_cp_header();
$myblock->getErrors();
--- 184,190 ----
break;
}
! $myblock->setVar('name', $name);
! $newid = $myblock->store();
! if (!$newid) {
xoops_cp_header();
$myblock->getErrors();
***************
*** 165,199 ****
exit();
}
! redirect_header("admin.php?fct=blocksadmin",1,_AM_DBUPDATED);
exit();
}
function edit_block($bid){
$myblock = new XoopsBlock($bid);
! OpenTable();
! echo "<h4 style='text-align:left;'>" ._AM_EDITBLOCK."</h4>
! <form action='admin.php?fct=blocksadmin' method='post'>
! <table border='0' cellpadding='0' cellspacing='0' valign='top' width='100%'><tr><td class='bg2'>
! <table width='100%' border='0' cellpadding='4' cellspacing='1'>
! <tr align='left' valign='top'><td class='bg3' width='30%'>
! <b>"._AM_NAME."</b></td><td class='bg1'>".$myblock->getVar("name")."</td></tr>
! <tr align='left' valign='top'><td class='bg3'>
! <b>"._AM_BLKTYPE."</b></td>
! <td class='bg1'>
! <select name='bside'>
! <option value='0'";
! if ( $myblock->getVar("side") == 0 ) echo " selected='selected'";
echo ">" ._AM_SBLEFT."</option>
<option value='1'";
! if ( $myblock->getVar("side") == 1 ) echo " selected='selected'";
echo ">" ._AM_SBRIGHT."</option>
<option value='3'";
! if ( $myblock->getVar("side") == 3 ) echo " selected='selected'";
echo ">" ._AM_CBLEFT."</option>
<option value='5'";
! if ( $myblock->getVar("side") == 5 ) echo " selected='selected'";
echo ">" ._AM_CBCENTER."</option>
<option value='4'";
! if ( $myblock->getVar("side") == 4 ) echo " selected='selected'";
echo ">" ._AM_CBRIGHT."</option>
</select>
--- 192,241 ----
exit();
}
! $db =& Database::getInstance();
! foreach ($bmodule as $bmid) {
! $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
! $db->query($sql);
! }
! $groups =& $xoopsUser->getGroups();
! $count = count($groups);
! for ($i = 0; $i < $count; $i++) {
! $sql = "INSERT INTO ".$db->prefix('groups_blocks_link')." (groupid, block_id, type) VALUES (".$groups[$i].", ".$newid.", 'R')";
! $db->query($sql);
! }
! redirect_header('admin.php?fct=blocksadmin',1,_AM_DBUPDATED);
exit();
}
function edit_block($bid){
+ global $xoopsConfig;
+ include_once(XOOPS_ROOT_PATH.'/class/xoopslists.php');
$myblock = new XoopsBlock($bid);
! //OpenTable();
! echo "<h4 style='text-align:left;'>" ._AM_EDITBLOCK."</h4>";
! ?>
! <form action="admin.php?fct=blocksadmin" name="editblock" method="post">
! <table border="0" cellpadding="0" cellspacing="0" valign="top" width="100%"><tr><td class="bg2">
! <table width="100%" border="0" cellpadding="4" cellspacing="1">
! <tr align="left" valign="top"><td class="bg3" width="30%">
! <b><?php _AM_NAME;?></b></td><td class="bg1"><?php $myblock->getVar('name');?></td></tr>
! <tr align="left" valign="top"><td class="bg3">
! <b><?php _AM_BLKTYPE;?></b></td>
! <td class="bg1">
! <select name="bside">
! <?php
! echo '<option value="0"';
! if ( $myblock->getVar('side') == 0 ) echo ' selected="selected"';
echo ">" ._AM_SBLEFT."</option>
<option value='1'";
! if ( $myblock->getVar('side') == 1 ) echo " selected='selected'";
echo ">" ._AM_SBRIGHT."</option>
<option value='3'";
! if ( $myblock->getVar('side') == 3 ) echo " selected='selected'";
echo ">" ._AM_CBLEFT."</option>
<option value='5'";
! if ( $myblock->getVar('side') == 5 ) echo " selected='selected'";
echo ">" ._AM_CBCENTER."</option>
<option value='4'";
! if ( $myblock->getVar('side') == 4 ) echo " selected='selected'";
echo ">" ._AM_CBRIGHT."</option>
</select>
***************
*** 202,226 ****
</td><td class='bg1'>
<input type='text' name='bweight' size='2' maxlength='2' value='";
! echo $myblock->getVar("weight");
! echo "' />
! </td></tr><tr align='left' valign='top'><td class='bg3'>
! <b>"._AM_VISIBLE."</b></td><td class='bg1'>
! <select name='bvisible'>
! <option value='0'";
! if ( $myblock->getVar("visible") == 0 ) echo " selected='selected'";
! echo ">" ._AM_NO."</option>
! <option value='1'";
! if ( $myblock->getVar("visible") == 1 ) echo " selected='selected'";
! echo ">" ._AM_YES."</option>";
! echo "</select>
! </td></tr><tr align='left' valign='top'><td class='bg3'>
<b>" ._AM_TITLE."</b></td><td class='bg1'>
<input type='text' name='btitle' size='60' maxlength='60' value='";
! echo $myblock->getVar("title", "E");
echo "' />
</td></tr><tr align='left' valign='top'><td class='bg3'>
<b>"._AM_CONTENT."</b><br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_USEFULTAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>".sprintf(_AM_BLOCKTAG1, "{X_SITEURL}", XOOPS_URL."/")."</span></td><td class='bg1'>
<textarea name='bcontent' cols='60' rows='10'>";
! echo $myblock->getContent("E");
echo "</textarea>
</td></tr>";
--- 244,282 ----
</td><td class='bg1'>
<input type='text' name='bweight' size='2' maxlength='2' value='";
! echo $myblock->getVar('weight');
! echo "' /></td></tr><tr align='left' valign='top'><td class='bg3'><b>"._AM_VISIBLE."</b></td><td class='bg1'><select name='bvisible'><option value='0'";
! if ( $myblock->getVar('visible') == 0 ) echo " selected='selected'";
! echo ">" ._AM_NO."</option><option value='1'";
! if ( $myblock->getVar('visible') == 1 ) echo " selected='selected'";
! echo '>'._AM_YES.'</option></select></td></tr>';
! echo '<tr><td class="bg3" valign="top"><b>'._AM_VISIBLEIN.'</b></td><td class="bg1"><select size="5" name="bmodule[]" multiple="multiple">';
! $db =& Database::getInstance();
! $sql = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.intval($bid);
! $result = $db->query($sql);
! $selected = array();
! while ($row = $db->fetchArray($result)) {
! $selected[] = intval($row['module_id']);
! }
! $module_list =& XoopsModule::getHasMainModulesList();
! $module_list[0] = _AM_ALLPAGES;
! $module_list[-1] = _AM_TOPONLY;
! ksort($module_list);
! foreach ($module_list as $k => $v) {
! $sel = '';
! if (in_array($k, $selected)) {
! $sel = ' selected="selected"';
! }
! echo '<option value="'.$k.'"'.$sel.'>'.$v.'</option>';
! }
! echo '</select></td></tr>';
! echo "<tr align='left' valign='top'><td class='bg3'>
<b>" ._AM_TITLE."</b></td><td class='bg1'>
<input type='text' name='btitle' size='60' maxlength='60' value='";
! echo $myblock->getVar('title', 'E');
echo "' />
</td></tr><tr align='left' valign='top'><td class='bg3'>
<b>"._AM_CONTENT."</b><br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_USEFULTAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>".sprintf(_AM_BLOCKTAG1, "{X_SITEURL}", XOOPS_URL."/")."</span></td><td class='bg1'>
<textarea name='bcontent' cols='60' rows='10'>";
! echo $myblock->getContent('E');
echo "</textarea>
</td></tr>";
***************
*** 230,237 ****
<select name='bposition'>
<option value='0'";
! if ( $myblock->getVar("position") == 0) echo " selected='selected'";
echo ">" ._AM_ABOVEORG."</option>
<option value='1'";
! if ( $myblock->getVar("position") == 1) echo " selected='selected'";
echo ">" ._AM_AFTERORG."</option>
</select>
--- 286,293 ----
<select name='bposition'>
<option value='0'";
! if ( $myblock->getVar('position') == 0) echo " selected='selected'";
echo ">" ._AM_ABOVEORG."</option>
<option value='1'";
! if ( $myblock->getVar('position') == 1) echo " selected='selected'";
echo ">" ._AM_AFTERORG."</option>
</select>
***************
*** 242,259 ****
<select name='bctype'>
<option value='H'";
! if ( $myblock->getVar("c_type") == "H") echo " selected='selected'";
echo ">" ._AM_HTML."</option>
<option value='P'";
! if ( $myblock->getVar("c_type") == "P") echo " selected='selected'";
echo ">" ._AM_PHP."</option>
<option value='S'";
! if ( $myblock->getVar("c_type") == "S") echo " selected='selected'";
echo ">" ._AM_AFWSMILE."</option>
<option value='T'";
! if ( $myblock->getVar("c_type") == "T") echo " selected='selected'";
echo ">" ._AM_AFNOSMILE."</option>
</select>
</td></tr>";
!
$edit_form = $myblock->getOptions();
if ( $edit_form != false ) {
--- 298,328 ----
<select name='bctype'>
<option value='H'";
! if ( $myblock->getVar('c_type') == 'H') echo " selected='selected'";
echo ">" ._AM_HTML."</option>
<option value='P'";
! if ( $myblock->getVar('c_type') == 'P') echo " selected='selected'";
echo ">" ._AM_PHP."</option>
<option value='S'";
! if ( $myblock->getVar('c_type') == 'S') echo " selected='selected'";
echo ">" ._AM_AFWSMILE."</option>
<option value='T'";
! if ( $myblock->getVar('c_type') == 'T') echo " selected='selected'";
echo ">" ._AM_AFNOSMILE."</option>
</select>
</td></tr>";
! if (!is_dir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks')) {
! $block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/xoops/blocks/');
! } else {
! $block_templates =& XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/');
! }
! echo '<tr valign="top"><td class="bg3"><b>'._AM_BTEMPLATE.'</b></td><td class="bg1"><select name="btemplate">';
! foreach ($block_templates as $key => $value) {
! echo '<option value="'.$key.'"';
! if ($myblock->getVar('btemplate') == $key) {
! echo ' selected="selected"';
! }
! echo '>'.$value.'</option>';
! }
! echo '</select></td></tr>';
$edit_form = $myblock->getOptions();
if ( $edit_form != false ) {
***************
*** 262,300 ****
echo "</td></tr>";
}
echo "<tr align='left' valign='top'><td class='bg3'> </td>
<td class='bg1'>
<input type='hidden' name='op' value='update' />
<input type='hidden' name='bid' value='".$myblock->getVar("bid")."' />
! <input type='submit' value='" ._AM_SAVECHANGES."' />
<input type='button' onclick='location=\"admin.php?fct=blocksadmin\"' value='" ._CANCEL."' />
</td></tr></table></td></tr></table>
</form>
";
! CloseTable();
}
! function update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $bcontent, $bctype, $options=""){
$myblock = new XoopsBlock($bid);
! $myblock->setVar("side", $bside);
! $myblock->setVar("weight", $bweight);
! $myblock->setVar("position", $bposition);
! $myblock->setVar("visible", $bvisible);
! $myblock->setVar("weight", $bweight);
! $myblock->setVar("title", $btitle);
! $myblock->setVar("content", $bcontent);
if ( isset($options) && (count($options) > 0) ) {
! $options = implode("|", $options);
! $myblock->setVar("options", $options);
}
! $myblock->setVar("c_type", $bctype);
! if ( $myblock->getVar("type") == "C" ) {
switch ($bctype) {
! case "H":
$name = _AM_CUSTOMHTML;
break;
! case "P":
$name = _AM_CUSTOMPHP;
break;
! case "S":
$name = _AM_CUSTOMSMILE;
break;
--- 331,376 ----
echo "</td></tr>";
}
+ echo '<tr valign="top"><td class="bg3"><b>'._AM_ADVANCED.'</b></td><td class="bg1">'._AM_BCACHETIME.' <input type="text" name="bcachetime" size="10" maxlength="10" value="'.$myblock->getVar('bcachetime').'" />';
+ //echo '<br />'._AM_BALIAS.' <input type="text" name="balias" size="50" maxlength="50" value="'.$myblock->getVar('balias', 'E').'" />';
+ echo '</td></tr>';
echo "<tr align='left' valign='top'><td class='bg3'> </td>
<td class='bg1'>
<input type='hidden' name='op' value='update' />
<input type='hidden' name='bid' value='".$myblock->getVar("bid")."' />
! <input type='submit' name='savebutton' value='" ._AM_SAVECHANGES."' />
<input type='button' onclick='location=\"admin.php?fct=blocksadmin\"' value='" ._CANCEL."' />
</td></tr></table></td></tr></table>
</form>
";
! //CloseTable();
}
! function update_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $balias, $bcachetime, $bmodule, $options=array()){
! global $xoopsConfig;
$myblock = new XoopsBlock($bid);
! $myblock->setVar('side', $bside);
! $myblock->setVar('weight', $bweight);
! $myblock->setVar('position', $bposition);
! $myblock->setVar('visible', $bvisible);
! $myblock->setVar('weight', $bweight);
! $myblock->setVar('title', $btitle);
! $myblock->setVar('content', $bcontent);
! $myblock->setVar('btemplate', $btemplate);
! $myblock->setVar('balias', $balias);
! $myblock->setVar('bcachetime', $bcachetime);
if ( isset($options) && (count($options) > 0) ) {
! $options = implode('|', $options);
! $myblock->setVar('options', $options);
}
! $myblock->setVar('c_type', $bctype);
! if ( $myblock->getVar('type') == 'C' ) {
switch ($bctype) {
! case 'H':
$name = _AM_CUSTOMHTML;
break;
! case 'P':
$name = _AM_CUSTOMPHP;
break;
! case 'S':
$name = _AM_CUSTOMSMILE;
break;
***************
*** 303,310 ****
break;
}
! $myblock->setVar("name", $name);
}
! $myblock->store();
! redirect_header("admin.php?fct=blocksadmin",1,_AM_DBUPDATED);
exit();
}
--- 379,403 ----
break;
}
! $myblock->setVar('name', $name);
}
! if ($myblock->store() != false) {
! $db =& Database::getInstance();
! $sql = 'DELETE FROM '.$db->prefix('block_module_link').' WHERE block_id='.$bid;
! $db->query($sql);
! foreach ($bmodule as $bmid) {
! $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$bid.', '.$bmid.')';
! $db->query($sql);
! }
! include_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');
! $xoopsTpl = new XoopsTpl('user');
! $xoopsTpl->setCaching(2);
! $xoopsTpl->setCacheDir(XOOPS_ROOT_PATH.'/cache');
! $xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
! $xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
! if (!$xoopsTpl->clear_cache('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate, $bid)) {
! echo 'false';
! }
! }
! redirect_header('admin.php?fct=blocksadmin',1,_AM_DBUPDATED);
exit();
}
***************
*** 312,329 ****
function delete_block($bid){
$myblock = new XoopsBlock($bid);
! if ( $myblock->getVar("type") == "S" ) {
$message = _AM_SYSTEMCANT;
! redirect_header("admin.php?fct=blocksadmin",4,$message);
exit();
! } elseif ($myblock->getVar("type") == "M") {
$message = _AM_MODULECANT;
! redirect_header("admin.php?fct=blocksadmin",4,$message);
exit();
} else {
echo "<h4 style='text-align:left;'>".sprintf(_AM_RUSUREDEL,$myblock->getVar("title"))."</h4>";
echo "<table><tr><td>\n";
! echo myTextForm("admin.php?fct=blocksadmin&op=delete_ok&bid=".$myblock->getVar("bid") , _AM_YES);
echo "</td><td>\n";
! echo myTextForm("admin.php?fct=blocksadmin" , _AM_NO);
echo "</td></tr></table>\n";
}
--- 405,422 ----
function delete_block($bid){
$myblock = new XoopsBlock($bid);
! if ( $myblock->getVar('type') == 'S' ) {
$message = _AM_SYSTEMCANT;
! redirect_header('admin.php?fct=blocksadmin',4,$message);
exit();
! } elseif ($myblock->getVar('type') == 'M') {
$message = _AM_MODULECANT;
! redirect_header('admin.php?fct=blocksadmin',4,$message);
exit();
} else {
echo "<h4 style='text-align:left;'>".sprintf(_AM_RUSUREDEL,$myblock->getVar("title"))."</h4>";
echo "<table><tr><td>\n";
! echo myTextForm('admin.php?fct=blocksadmin&op=delete_ok&bid='.$myblock->getVar('bid') , _AM_YES);
echo "</td><td>\n";
! echo myTextForm('admin.php?fct=blocksadmin' , _AM_NO);
echo "</td></tr></table>\n";
}
***************
*** 333,337 ****
$myblock = new XoopsBlock($bid);
$myblock->delete();
! redirect_header("admin.php?fct=blocksadmin",1,_AM_DBUPDATED);
exit();
}
--- 426,430 ----
$myblock = new XoopsBlock($bid);
$myblock->delete();
! redirect_header('admin.php?fct=blocksadmin',1,_AM_DBUPDATED);
exit();
}
***************
*** 339,351 ****
function order_block($bid, $weight, $visible, $side){
$myblock = new XoopsBlock($bid);
! $myblock->setVar("weight", $weight);
! $myblock->setVar("visible", $visible);
! $myblock->setVar("side", $side);
$myblock->store();
}
! /* function preview_cblock(){
! }*/
!
} else {
echo "Access Denied";
--- 432,507 ----
function order_block($bid, $weight, $visible, $side){
$myblock = new XoopsBlock($bid);
! $myblock->setVar('weight', $weight);
! $myblock->setVar('visible', $visible);
! $myblock->setVar('side', $side);
$myblock->store();
}
! /* function preview_block($bid, $bside, $bweight, $bposition, $bvisible, $btitle, $btemplate, $bcontent, $bctype, $balias, $bcachetime, $bmodule, $options){
! global $xoopsConfig;
! include_once(XOOPS_ROOT_PATH.'/class/xoopstpl.php');
! $xoopsTpl = new XoopsTpl('user');
! $xoopsTpl->setCaching(2);
! $xoopsTpl->setCacheDir(XOOPS_ROOT_PATH.'/cache');
! $xoopsTpl->setCompileDir(XOOPS_ROOT_PATH.'/templates_c');
! $xoopsTpl->setTemplateDir(XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme']);
! $myblock = new XoopsBlock($bid);
! $myblock->setVar('side', $bside);
! $myblock->setVar('weight', $bweight);
! $myblock->setVar('position', $bposition);
! $myblock->setVar('visible', $bvisible);
! $myblock->setVar('weight', $bweight);
! $myblock->setVar('title', $btitle);
! $myblock->setVar('content', $bcontent);
! $myblock->setVar('btemplate', $btemplate);
! $myblock->setVar('balias', $balias);
! $myblock->setVar('bcache', $bcache);
! $myblock->setVar('bcachetime', $bcachetime);
! if ( isset($options) && (count($options) > 0) ) {
! $options = implode('|', $options);
! $myblock->setVar('options', $options);
! }
! $myblock->setVar('c_type', $bctype);
! $block =& $myblock->buildBlock();
! if ($block) {
! $xoopsTpl->assign_by_ref('xoops_block', $block);
! }
! $fetched = $xoopsTpl->fetch('file:'.XOOPS_ROOT_PATH.'/themes/'.$xoopsConfig['default_theme'].'/blocks/'.$btemplate);echo $fetched;
! switch ($myblock->getVar('side')) {
! case XOOPS_SIDEBLOCK_LEFT:
! $xoopsTpl->append_by_ref('xoops_lblocks', $fetched);
! break;
! case XOOPS_CENTERBLOCK_LEFT:
! if (!isset($show_cblock)) {
! $xoopsTpl->assign('xoops_showcblock', 1);
! $show_cblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_clblocks', $fetched);
! break;
! case XOOPS_CENTERBLOCK_RIGHT:
! if (!isset($show_cblock)) {
! $xoopsTpl->assign('xoops_showcblock', 1);
! $show_cblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_crblocks', $fetched);
! break;
! case XOOPS_CENTERBLOCK_CENTER:
! if (!isset($show_cblock)) {
! $xoopsTpl->assign('xoops_showcblock', 1);
! $show_cblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_ccblocks', $fetched);
! break;
! case XOOPS_SIDEBLOCK_RIGHT:
! if (!isset($show_rblock)) {
! $xoopsTpl->assign('xoops_showrblock', 1);
! $show_rblock = 1;
! }
! $xoopsTpl->append_by_ref('xoops_rblocks', $fetched);
! break;
! }
! $xoopsTpl->display('layout.html');
! }
! */
} else {
echo "Access Denied";
|
|
From: <on...@us...> - 2002-09-18 11:54:33
|
Update of /cvsroot/xoops/xoops-current/html/include In directory usw-pr-cvs1:/tmp/cvs-serv8061 Modified Files: functions.php Log Message: no message Index: functions.php =================================================================== RCS file: /cvsroot/xoops/xoops-current/html/include/functions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** functions.php 18 Sep 2002 11:02:07 -0000 1.13 --- functions.php 18 Sep 2002 11:54:29 -0000 1.14 *************** *** 38,41 **** --- 38,42 ---- $meta = getMeta(); $meta = $myts->makeTareaData4InsideQuotes($meta); + echo "<!DOCTYPE html PUBLIC '//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>\n"; echo "<html>\n"; echo "<head>\n"; |
|
From: <on...@us...> - 2002-09-18 11:44:04
|
Update of /cvsroot/xoops/xoops-current/html/include In directory usw-pr-cvs1:/tmp/cvs-serv5437 Modified Files: xoopscodes.php Log Message: no message Index: xoopscodes.php =================================================================== RCS file: /cvsroot/xoops/xoops-current/html/include/xoopscodes.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** xoopscodes.php 17 Sep 2002 22:36:00 -0000 1.4 --- xoopscodes.php 18 Sep 2002 11:44:01 -0000 1.5 *************** *** 18,23 **** // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------- // ! // Author of File: // ! // Kazumi Ono (http://www.mywebaddons.com/ , http://www.myweb.ne.jp/) // // ------------------------------------------------------------------------- // ?> --- 18,24 ---- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------- // ! // Author: Kazumi Ono (AKA onokazu) // ! // URL: http://www.xoops.org/ http://jp.xoops.org/ http://www.myweb.ne.jp/ // ! // Project: The XOOPS Project (http://www.xoops.org/) // // ------------------------------------------------------------------------- // ?> *************** *** 48,54 **** var text2 = prompt("<?php echo _ENTERIMGPOS;?>\n<?php echo _IMGPOSRORL;?>", ""); while ( ( text2 != "" ) && ( text2 != "r" ) && ( text2 != "R" ) && ( text2 != "l" ) && ( text2 != "L" ) && ( text2 != null ) ) { ! text2 = prompt("<?php echo _ERRORIMGPOS;?>\n<?php echo _IMGPOSRORL;?>",""); } ! if ( text2 == "l" || text2 == "L" ) { text2 = " align=left"; } else if ( text2 == "r" || text2 == "R" ) { --- 49,55 ---- var text2 = prompt("<?php echo _ENTERIMGPOS;?>\n<?php echo _IMGPOSRORL;?>", ""); while ( ( text2 != "" ) && ( text2 != "r" ) && ( text2 != "R" ) && ( text2 != "l" ) && ( text2 != "L" ) && ( text2 != null ) ) { ! text2 = prompt("<?php echo _ERRORIMGPOS;?>\n<?php echo _IMGPOSRORL;?>",""); } ! if ( text2 == "l" || text2 == "L" ) { text2 = " align=left"; } else if ( text2 == "r" || text2 == "R" ) { *************** *** 171,175 **** } else { submitDom.disabled = true; ! return true; } } else { --- 172,176 ---- } else { submitDom.disabled = true; ! return true; } } else { *************** *** 188,192 **** * $textarea_id is a unique id of the target textarea */ ! function xoopsCodeTarea($textarea_id, $cols=50, $rows=10){ echo "<input type='button' value='URL' onclick='xoopsCodeUrl(\"$textarea_id\");' /><input type='button' value='IMG' onclick='xoopsCodeImg(\"$textarea_id\");' /><input type='button' value='EMAIL' onclick='xoopsCodeEmail(\"$textarea_id\");' /><input type='button' value='CODE' onclick='xoopsCodeCode(\"$textarea_id\");' /><input type='button' value='QUOTE' onclick='xoopsCodeQuote(\"$textarea_id\");' /><br />\n"; --- 189,193 ---- * $textarea_id is a unique id of the target textarea */ ! function xoopsCodeTarea($textarea_id, $cols=60, $rows=15){ echo "<input type='button' value='URL' onclick='xoopsCodeUrl(\"$textarea_id\");' /><input type='button' value='IMG' onclick='xoopsCodeImg(\"$textarea_id\");' /><input type='button' value='EMAIL' onclick='xoopsCodeEmail(\"$textarea_id\");' /><input type='button' value='CODE' onclick='xoopsCodeCode(\"$textarea_id\");' /><input type='button' value='QUOTE' onclick='xoopsCodeQuote(\"$textarea_id\");' /><br />\n"; *************** *** 240,244 **** echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-P \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_razz.gif' border='0' alt=':-P' /></a>"; echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-x \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_mad.gif' border='0' alt=':-x' /></a>"; ! echo " [<a href='javascript:openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&type=smilies&target=".$textarea_id."\",\"smilies\",300,430);'>"._MORE."</a>]"; } ?> --- 241,245 ---- echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-P \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_razz.gif' border='0' alt=':-P' /></a>"; echo "<a href='javascript: justReturn()' onclick='xoopsCodeSmilie(\"$textarea_id\", \" :-x \");'><img width='15' height='15' src='".XOOPS_URL."/".$smileyPath."/icon_mad.gif' border='0' alt=':-x' /></a>"; ! echo " [<a href='javascript:openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&type=smilies&target=".$textarea_id."\",\"smilies\",300,430);'>"._MORE."</a>]"; } ?> |
|
From: <on...@us...> - 2002-09-18 11:39:46
|
Update of /cvsroot/xoops/xoops-current/html/include
In directory usw-pr-cvs1:/tmp/cvs-serv4493
Modified Files:
common.php
Log Message:
no message
Index: common.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/common.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** common.php 18 Sep 2002 11:01:21 -0000 1.7
--- common.php 18 Sep 2002 11:39:42 -0000 1.8
***************
*** 48,54 ****
// uncomment the following lines to show all warning messages (for debug)
! //if ( $xoopsConfig['debug_mode'] == 1 ) {
! error_reporting (2039);
! //}
set_magic_quotes_runtime(0);
// #################### Include global config files ##################
--- 48,54 ----
// uncomment the following lines to show all warning messages (for debug)
! if ( $xoopsConfig['debug_mode'] == 1 ) {
! error_reporting(E_ALL);
! }
set_magic_quotes_runtime(0);
// #################### Include global config files ##################
|
|
From: <on...@us...> - 2002-09-18 11:20:33
|
Update of /cvsroot/xoops/xoops-current/html/class In directory usw-pr-cvs1:/tmp/cvs-serv32109 Added Files: xoopstpl.php Log Message: no message --- NEW FILE: xoopstpl.php --- <?php // $Id: xoopstpl.php,v 1.1 2002/09/18 11:20:29 onokazu Exp $ // ------------------------------------------------------------------------- // // XOOPS - PHP Content Management System // // <http://www.xoops.org/> // // ------------------------------------------------------------------------- // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation; either version 2 of the License, or // // (at your option) any later version. // // // // This program is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------- // // Author: Kazumi Ono (AKA onokazu) // // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ // // Project: The XOOPS Project // // ------------------------------------------------------------------------- // require_once(SMARTY_DIR."Smarty.class.php"); class XoopsTpl extends Smarty{ function XoopsTpl($id=null){ $this->Smarty(); $this->compile_id = isset($id) ? trim($id) : null; } function setTemplateDir($dirname){ if (substr(trim($dirname), -1) == '/' || substr(trim($dirname), -1) == '\\') { $dirname = substr($dirname, 1, -1); } $ret = ''; if (isset($this->template_dir)) { $ret = $this->template_dir; } $this->template_dir = $dirname; return $ret; } function setDebugging($flag=false){ $this->debugging = is_bool($flag) ? $flag : false; } function setCaching($num=0){ $this->caching = intval($num); } function setCompileDir($dirname){ if (substr(trim($dirname), -1) == '/' || substr(trim($dirname), -1) == '\\') { $dirname = substr($dirname, 1, -1); } $ret = ''; if (isset($this->compile_dir)) { $ret = $this->compile_dir; } $this->compile_dir = $dirname; return $ret; } function setCacheDir($dirname){ if (substr(trim($dirname), -1) == '/' || substr(trim($dirname), -1) == '\\') { $dirname = substr($dirname, 1, -1); } $ret = ''; if (isset($this->cache_dir)) { $ret = $this->cache_dir; } $this->cache_dir = $dirname; return $ret; } } ?> |
|
From: <on...@us...> - 2002-09-18 11:14:03
|
Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin
In directory usw-pr-cvs1:/tmp/cvs-serv30481
Modified Files:
modulesadmin.php main.php
Log Message:
no message
Index: modulesadmin.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin/modulesadmin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** modulesadmin.php 10 Sep 2002 04:09:16 -0000 1.3
--- modulesadmin.php 18 Sep 2002 11:13:59 -0000 1.4
***************
*** 59,64 ****
while ($file = readdir($handle)) {
clearstatcache();
! if ( !ereg("^[.]{1,2}$",$file) && is_dir($modules_dir."/".$file) ) {
! if ( !in_array(trim($file), $listed_mods) ) {
$module = new XoopsModule();
$module->loadModInfo($file);
--- 59,65 ----
while ($file = readdir($handle)) {
clearstatcache();
! $file = trim($file);
! if ($file != '' && !preg_matcgh("/^[.]{1,2}$/",$file) && is_dir($modules_dir.'/'.$file)) {
! if ( !in_array($file, $listed_mods) ) {
$module = new XoopsModule();
$module->loadModInfo($file);
***************
*** 112,116 ****
return $ret;
} else {
! $groups = $xoopsUser->groups();
// retrieve all block ids for this module
$blocks =& XoopsBlock::getByModule($newmid, false);
--- 113,117 ----
return $ret;
} else {
! $groups =& $xoopsUser->getGroups();
// retrieve all block ids for this module
$blocks =& XoopsBlock::getByModule($newmid, false);
***************
*** 300,304 ****
foreach ( $adminmenu as $menuitem ) {
$menuitem['link'] = trim($menuitem['link']);
! $menuitem['target'] = trim($menuitem['target']);
$tree[$cnt][0] = 2;
$tree[$cnt][1] = trim($menuitem['title']);
--- 301,305 ----
foreach ( $adminmenu as $menuitem ) {
$menuitem['link'] = trim($menuitem['link']);
! $menuitem['target'] = isset($menuitem['target']) ? trim($menuitem['target']) : '';
$tree[$cnt][0] = 2;
$tree[$cnt][1] = trim($menuitem['title']);
Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/modulesadmin/main.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.php 15 Jul 2002 08:13:45 -0000 1.1.1.1
--- main.php 18 Sep 2002 11:13:59 -0000 1.2
***************
*** 13,16 ****
--- 13,17 ----
if ( $op == "list" ) {
module_list();
+ exit();
}
***************
*** 95,98 ****
--- 96,100 ----
CloseTable();
xoops_cp_footer();
+ exit();
}
if ( $op == "submit" ) {
|
|
From: <on...@us...> - 2002-09-18 11:11:42
|
Update of /cvsroot/xoops/xoops-current/html/class In directory usw-pr-cvs1:/tmp/cvs-serv29866 Modified Files: xoopslogger.php xoopslists.php Log Message: no message Index: xoopslogger.php =================================================================== RCS file: /cvsroot/xoops/xoops-current/html/class/xoopslogger.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xoopslogger.php 18 Sep 2002 11:08:44 -0000 1.1 --- xoopslogger.php 18 Sep 2002 11:11:39 -0000 1.2 *************** *** 21,24 **** --- 21,25 ---- // Author: Kazumi Ono (AKA onokazu) // // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ // + // Project: The XOOPS Project // // ------------------------------------------------------------------------- // Index: xoopslists.php =================================================================== RCS file: /cvsroot/xoops/xoops-current/html/class/xoopslists.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xoopslists.php 6 Sep 2002 03:35:44 -0000 1.3 --- xoopslists.php 18 Sep 2002 11:11:39 -0000 1.4 *************** *** 19,22 **** --- 19,26 ---- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------- // + // Author: The XOOPS Project // + // URL: http://www.xoops.org/ // + // Project: The XOOPS Project // + // ------------------------------------------------------------------------- // if ( !defined("XOOPS_LISTS_INCLUDED") ) { *************** *** 41,45 **** function &getDirListAsArray($dirname) { $dirlist = array(); - //$dirname = str_replace(".", "", $dirname); $handle=@opendir($dirname); while ( ($file = readdir($handle)) ) { --- 45,48 ---- *************** *** 57,65 **** /* * gets list of image file names in a directory */ function &getImgListAsArray($dirname, $prefix="") { $filelist = array(); - //$dirname = str_replace(".", "", $dirname); $handle=@opendir($dirname); while ( ($file = readdir($handle)) ) { --- 60,85 ---- /* + * gets list of all files in a directory + */ + function &getFileListAsArray($dirname, $prefix="") { + $filelist = array(); + $handle=@opendir($dirname); + while ( ($file = readdir($handle)) ) { + if (!preg_match("/^[.]{1,2}$/",$file)) { + $file = $prefix.$file; + $filelist[$file]=$file; + } + } + closedir($handle); + asort($filelist); + reset($filelist); + return $filelist; + } + + /* * gets list of image file names in a directory */ function &getImgListAsArray($dirname, $prefix="") { $filelist = array(); $handle=@opendir($dirname); while ( ($file = readdir($handle)) ) { |
|
From: <on...@us...> - 2002-09-18 11:08:48
|
Update of /cvsroot/xoops/xoops-current/html/class In directory usw-pr-cvs1:/tmp/cvs-serv29243 Added Files: xoopslogger.php Log Message: no message --- NEW FILE: xoopslogger.php --- <?php // $Id: xoopslogger.php,v 1.1 2002/09/18 11:08:44 onokazu Exp $ // ------------------------------------------------------------------------- // // XOOPS - PHP Content Management System // // <http://www.xoops.org/> // // ------------------------------------------------------------------------- // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // // the Free Software Foundation; either version 2 of the License, or // // (at your option) any later version. // // // // This program is distributed in the hope that it will be useful, // // but WITHOUT ANY WARRANTY; without even the implied warranty of // // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // // GNU General Public License for more details. // // // // You should have received a copy of the GNU General Public License // // along with this program; if not, write to the Free Software // // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // ------------------------------------------------------------------------- // // Author: Kazumi Ono (AKA onokazu) // // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ // // ------------------------------------------------------------------------- // class XoopsLogger{ var $queries = array(); var $blocks = array(); var $logstart = array(); var $logend = array(); function XoopsLogger(){ } function &getInstance(){ static $instance; if (!isset($instance)) { $instance = new XoopsLogger(); } return $instance; } function startTime($name = 'XOOPS'){ $this->logstart[$name] = explode(' ', microtime()); } function stopTime($name = 'XOOPS'){ $this->logend[$name] = explode(' ', microtime()); } function addQuery($sql, $error=NULL, $errno=NULL){ $this->queries[] = array('sql' => $sql, 'error' => $error, 'errno' => $errno); } function addBlock($name, $cached = false, $cachetime = 0){ $this->blocks[] = array('name' => $name, 'cached' => $cached, 'cachetime' => $cachetime); } function dumpQueries(){ $ret = '<div style="margin: 0px 5px 5px 5px; background: #ffffff; padding: 5px; border: 1px dashed; background-color: #ffffff; color: #333333; text-align:left;"><h4 style="width:50%; text-align:left; border-bottom: 1px dashed;">Queries</h4>'; foreach ($this->queries as $q) { if (isset($q['error'])) { $ret .= '<span style="color:#ff0000;">'.htmlentities($q['sql']).'<br /><b>Error number:</b> '.$q['errno'].'<br /><b>Error message:</b> '.$q['error'].'</span><br /><br />'; } else { $ret .= htmlentities($q['sql']).'<br /><br />'; } } $ret .= 'Total: <span style="color:#ff0000;">'.count($this->queries).'</span> queries</div>'; return $ret; } function dumpBlocks(){ $ret = '<div style="margin: 0px 5px 5px 5px; background: #ffffff; padding: 5px; border: 1px dashed; background-color: #ffffff; color: #333333; text-align:left;"><h4 style="width:50%; text-align:left; border-bottom: 1px dashed;">Blocks</h4>'; foreach ($this->blocks as $b) { if ($b['cached']) { $ret .= '<b>'.$b['name'].'</b> is using cache (regenerates every '.$b['cachetime'].' seconds)<br /><br />'; } else { $ret .= '<b>'.$b['name'].'</b> is created<br /><br />'; } } $ret .= 'Total: <span style="color:#ff0000;">'.count($this->blocks).'</span> blocks</div>'; return $ret; } function dumpTime($name = 'XOOPS'){ if (!isset($this->logstart[$name])) { return 0; } if (!isset($this->logend[$name])) { $stop_time = explode(' ', microtime()); } else { $stop_time = $this->logend[$name]; } /*echo '<pre>';echo var_dump($stop_time);echo '</pre>'; echo '<pre>';echo var_dump($this->logstart);echo '</pre>';*/ return ((float)$stop_time[1] + (float)$stop_time[0]) - ((float)$this->logstart[$name][1] + (float)$this->logstart[$name][0]); } function dumpAll(){ $ret = $this->dumpQueries(); $ret .= $this->dumpBlocks(); if (count($this->logstart) > 0) { $ret .= '<div style="margin: 0px 5px 5px 5px; background: #ffffff; padding: 5px; border: 1px dashed; background-color: #ffffff; color: #333333; text-align:left;"><h4 style="width:50%; text-align:left; border-bottom: 1px dashed;">Execution Time</h4>'; foreach ($this->logstart as $k => $v) { $ret .= '<b>'.$k.'</b> took <span style="color:#ff0000;">'.$this->dumpTime($k).'</span> seconds to load.<br /><br />'; } $ret .= '</div>'; } return $ret; } } ?> |
|
From: <on...@us...> - 2002-09-18 11:02:10
|
Update of /cvsroot/xoops/xoops-current/html/include
In directory usw-pr-cvs1:/tmp/cvs-serv27667
Modified Files:
functions.php cp_functions.php
Log Message:
no message
Index: functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/functions.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** functions.php 6 Sep 2002 02:36:50 -0000 1.12
--- functions.php 18 Sep 2002 11:02:07 -0000 1.13
***************
*** 298,301 ****
--- 298,302 ----
</body>
</html>';
+ exit();
}
***************
*** 426,430 ****
}
if ( $xoopsUser ) {
! $arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, $side, XOOPS_BLOCK_VISIBLE);
} else {
$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
--- 427,431 ----
}
if ( $xoopsUser ) {
! $arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->getGroups(), true, $side, XOOPS_BLOCK_VISIBLE);
} else {
$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, $side, XOOPS_BLOCK_VISIBLE);
***************
*** 456,460 ****
$arr = array();
if ( $xoopsUser ) {
! $arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->groups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
} else {
$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
--- 457,461 ----
$arr = array();
if ( $xoopsUser ) {
! $arr =& $xoopsblock->getAllBlocksByGroup($xoopsUser->getGroups(), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
} else {
$arr =& $xoopsblock->getAllBlocksByGroup(XoopsGroup::getByType("Anonymous"), true, XOOPS_CENTERBLOCK_ALL, XOOPS_BLOCK_VISIBLE);
Index: cp_functions.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/include/cp_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cp_functions.php 16 Aug 2002 09:24:44 -0000 1.2
--- cp_functions.php 18 Sep 2002 11:02:07 -0000 1.3
***************
*** 25,29 ****
xoops_header(false);
include_once(XOOPS_ROOT_PATH."/modules/system/cache/adminmenu.php");
! $admin_mids = XoopsModule::getByRight($xoopsUser->groups(), "A");
$abscissa_step = 140; // step for the left boundaries of layers
$abscissa_offset = 15; // to choose the horizontal coordinate start offset for the layers
--- 25,29 ----
xoops_header(false);
include_once(XOOPS_ROOT_PATH."/modules/system/cache/adminmenu.php");
! $admin_mids = XoopsModule::getByRight($xoopsUser->getGroups(), "A");
$abscissa_step = 140; // step for the left boundaries of layers
$abscissa_offset = 15; // to choose the horizontal coordinate start offset for the layers
|
275 messages has been excluded from this view by a project administrator.
