phpmp-commits Mailing List for phpMyPublications (Page 8)
Status: Pre-Alpha
Brought to you by:
heimidal
Menu
▾
▴
phpmp-commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(69) |
May
(1) |
Jun
|
Jul
(53) |
Aug
(27) |
Sep
|
Oct
|
Nov
(35) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(65) |
Mar
|
Apr
(15) |
May
(40) |
Jun
(72) |
Jul
|
Aug
(2) |
Sep
(95) |
Oct
(37) |
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Gordon P. H. <gph...@us...> - 2003-06-29 19:04:21
|
Update of /cvsroot/phpmp/phpMP/languages/english
In directory sc8-pr-cvs1:/tmp/cvs-serv8893/languages/english
Modified Files:
lang_main.php
Log Message:
Fixed a tabulating problem and capitalized the P in "Powered by". - GPHemsley
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/languages/english/lang_main.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** lang_main.php 29 Jun 2003 08:19:56 -0000 1.23
--- lang_main.php 29 Jun 2003 19:04:19 -0000 1.24
***************
*** 39,43 ****
// Note: Always escape single quote characters (') with a backslash (\).
//
! 'WELCOME_TO' => 'Welcome to ',
'HOME' => 'Home',
'PROFILE' => 'Profile',
--- 39,43 ----
// Note: Always escape single quote characters (') with a backslash (\).
//
! 'WELCOME_TO' => 'Welcome to ',
'HOME' => 'Home',
'PROFILE' => 'Profile',
***************
*** 46,50 ****
'USERNAME' => 'Username',
'USER_CP' => 'User CP',
! 'USER_CONTROL_PANEL' => 'User Control Panel',
'E_MAIL' => 'E-mail',
'PASSWORD' => 'Password',
--- 46,50 ----
'USERNAME' => 'Username',
'USER_CP' => 'User CP',
! 'USER_CONTROL_PANEL' => 'User Control Panel',
'E_MAIL' => 'E-mail',
'PASSWORD' => 'Password',
***************
*** 54,58 ****
'REGISTER' => 'Register',
'MAIN_MENU' => 'Main Menu',
! 'USER_SETTINGS' => 'User Settings',
'ADMINISTRATION AREA' => 'Administration Area',
--- 54,58 ----
'REGISTER' => 'Register',
'MAIN_MENU' => 'Main Menu',
! 'USER_SETTINGS' => 'User Settings',
'ADMINISTRATION AREA' => 'Administration Area',
***************
*** 76,80 ****
// Other various parts of the templates.
//
! 'POWERED_BY' => 'powered by phpMP ' . $Config->get('version') . ' © 2003 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
'COPYRIGHT' => 'All content is property of its respective owner. All rights reserved.'
--- 76,80 ----
// Other various parts of the templates.
//
! 'POWERED_BY' => 'Powered by phpMP ' . $Config->get('version') . ' © 2003 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
'COPYRIGHT' => 'All content is property of its respective owner. All rights reserved.'
|
|
From: Gordon P. H. <gph...@us...> - 2003-06-29 18:50:16
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv7100/includes
Modified Files:
template.php
Log Message:
I commented out the things that were causing errors. - GPHemsley
Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** template.php 29 Jun 2003 08:34:37 -0000 1.42
--- template.php 29 Jun 2003 18:50:13 -0000 1.43
***************
*** 290,294 ****
$compile_blocks = array();
! for ($curr_tb = 0; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
--- 290,294 ----
$compile_blocks = array();
! /* for ($curr_tb = 0; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
***************
*** 356,360 ****
break;
}
! }
$template_php = '';
--- 356,360 ----
break;
}
! }*/
$template_php = '';
***************
*** 362,366 ****
{
$trim_check_text = trim($text_blocks[$i]);
! $trim_check_block = trim($compile_blocks[$i]);
$template_php .= (!$no_echo) ? ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '') : ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '');
}
--- 362,366 ----
{
$trim_check_text = trim($text_blocks[$i]);
! // $trim_check_block = trim($compile_blocks[$i]);
$template_php .= (!$no_echo) ? ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '') : ((!empty($trim_check_text)) ? $text_blocks[$i] : '') . ((!empty($compile_blocks[$i])) ? $compile_blocks[$i] : '');
}
|
|
From: Brian R. <hei...@us...> - 2003-06-29 18:33:24
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv4663/includes
Modified Files:
config.init.php core.php debug.php functions.php session.php
user.php
Log Message:
Updating function names.
Index: config.init.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/config.init.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** config.init.php 29 Jun 2003 08:19:55 -0000 1.7
--- config.init.php 29 Jun 2003 18:33:21 -0000 1.8
***************
*** 35,39 ****
// Loop through all config values from DB.
// Define each key as its respective value.
! while( $row = $DB->fetchArray( $result ) )
{
$this->_cfgvars[$row['config_key']] = $row['config_value'];
--- 35,39 ----
// Loop through all config values from DB.
// Define each key as its respective value.
! while( $row = $DB->fetch_array( $result ) )
{
$this->_cfgvars[$row['config_key']] = $row['config_value'];
Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** core.php 29 Jun 2003 08:19:55 -0000 1.59
--- core.php 29 Jun 2003 18:33:21 -0000 1.60
***************
*** 26,30 ****
{
! function stripMagicQuotes($arr)
{
foreach ($arr as $k => $v)
--- 26,30 ----
{
! function strip_magic_quotes($arr)
{
foreach ($arr as $k => $v)
***************
*** 56,62 ****
if (get_magic_quotes_gpc())
{
! if (!empty($_GET)) { $_GET = $this->stripMagicQuotes($_GET); }
! if (!empty($_POST)) { $_POST = $this->stripMagicQuotes($_POST); }
! if (!empty($_COOKIE)) { $_COOKIE = $this->stripMagicQuotes($_COOKIE); }
}
--- 56,62 ----
if (get_magic_quotes_gpc())
{
! if (!empty($_GET)) { $_GET = $this->strip_magic_quotes($_GET); }
! if (!empty($_POST)) { $_POST = $this->strip_magic_quotes($_POST); }
! if (!empty($_COOKIE)) { $_COOKIE = $this->strip_magic_quotes($_COOKIE); }
}
***************
*** 99,103 ****
$User = new User(); // Create an instance of User.
! createVars();
include_once(PHPMP_ROOT . 'includes/session.php');
--- 99,103 ----
$User = new User(); // Create an instance of User.
! create_vars();
include_once(PHPMP_ROOT . 'includes/session.php');
Index: debug.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/debug.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** debug.php 29 Jun 2003 08:19:55 -0000 1.8
--- debug.php 29 Jun 2003 18:33:21 -0000 1.9
***************
*** 28,37 ****
function Debug()
{
! @set_error_handler( array(&$this, 'msgDisplay') );
}
// Very similar to that of phpBB2, considering this is my first forray into error management.
// Hopefully, once I figure all of these different error codes and such out, I'll make it fit in more with the project.
! function msgDisplay($errno, $msg_text, $errfile, $errline)
{
global $DB, $Config, $User, $Template;
--- 28,37 ----
function Debug()
{
! @set_error_handler( array(&$this, 'msg_display') );
}
// Very similar to that of phpBB2, considering this is my first forray into error management.
// Hopefully, once I figure all of these different error codes and such out, I'll make it fit in more with the project.
! function msg_display($errno, $msg_text, $errfile, $errline)
{
global $DB, $Config, $User, $Template;
Index: functions.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/functions.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** functions.php 29 Jun 2003 08:19:55 -0000 1.31
--- functions.php 29 Jun 2003 18:33:21 -0000 1.32
***************
*** 27,31 ****
// Accepts: none.
// Returns: none.
! function createVars()
{
global $Config, $User;
--- 27,31 ----
// Accepts: none.
// Returns: none.
! function create_vars()
{
global $Config, $User;
Index: session.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/session.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** session.php 29 Jun 2003 08:19:55 -0000 1.14
--- session.php 29 Jun 2003 18:33:22 -0000 1.15
***************
*** 43,47 ****
if($this->started == false)
{
! $this->getSessionData();
$this->started = true;
}
--- 43,47 ----
if($this->started == false)
{
! $this->get_session_data();
$this->started = true;
}
***************
*** 91,99 ****
$result = $DB->query($sql);
! $num_rows = $DB->numRows($result);
if( $num_rows == 1 ) // We have a user!
{
! $User->set( $DB->fetchAssoc($result) );
$this->session_user_id = $User->get('user_id');
$this->is_logged_in = true;
--- 91,99 ----
$result = $DB->query($sql);
! $num_rows = $DB->num_rows($result);
if( $num_rows == 1 ) // We have a user!
{
! $User->set( $DB->fetch_assoc($result) );
$this->session_user_id = $User->get('user_id');
$this->is_logged_in = true;
***************
*** 137,141 ****
$cur_time = time(); // Time as of right now.
$exp_time = $cur_time + $Config->get('session_length'); // Time at which this session will become invalid.
! $this->ip = $User->getIPEncoded(); // Gets the user's IP address.
$session_exists = false; // We'll assume that no sessions exist yet.
--- 137,141 ----
$cur_time = time(); // Time as of right now.
$exp_time = $cur_time + $Config->get('session_length'); // Time at which this session will become invalid.
! $this->ip = $User->get_ip_encoded(); // Gets the user's IP address.
$session_exists = false; // We'll assume that no sessions exist yet.
***************
*** 150,154 ****
$result = $DB->query($sql);
! $num_rows = $DB->numRows($result);
// Checks for a session in the database.
--- 150,154 ----
$result = $DB->query($sql);
! $num_rows = $DB->num_rows($result);
// Checks for a session in the database.
***************
*** 157,161 ****
// If the session is expired, we'll go ahead and create a new one regardless.
// The old one *should* be cleaned out by our clean() function later.
! $this->session_data = $DB->fetchAssoc($result);
if( $this->session_data['session_exp_time'] < $cur_time )
{
--- 157,161 ----
// If the session is expired, we'll go ahead and create a new one regardless.
// The old one *should* be cleaned out by our clean() function later.
! $this->session_data = $DB->fetch_assoc($result);
if( $this->session_data['session_exp_time'] < $cur_time )
{
***************
*** 202,206 ****
$result = $DB->query($sql);
! $User->set( $DB->fetchAssoc($result) );
}
--- 202,206 ----
$result = $DB->query($sql);
! $User->set( $DB->fetch_assoc($result) );
}
***************
*** 230,234 ****
}
! function getSessionData()
{
global $Config, $DB, $User;
--- 230,234 ----
}
! function get_session_data()
{
global $Config, $DB, $User;
***************
*** 272,280 ****
$result = $DB->query($sql);
! $num_rows = $DB->numRows($result);
if( $num_rows == 1 ) // This cookie is valid.
{
! $User->set( $DB->fetchAssoc($result) );
$User->set('invisible_mode', $auto_cookie_array[2]);
$this->session_user_id = $auto_cookie_array[0];
--- 272,280 ----
$result = $DB->query($sql);
! $num_rows = $DB->num_rows($result);
if( $num_rows == 1 ) // This cookie is valid.
{
! $User->set( $DB->fetch_assoc($result) );
$User->set('invisible_mode', $auto_cookie_array[2]);
$this->session_user_id = $auto_cookie_array[0];
Index: user.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/user.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** user.php 29 Jun 2003 08:19:56 -0000 1.25
--- user.php 29 Jun 2003 18:33:22 -0000 1.26
***************
*** 69,73 ****
// Taken from phpBB2. Fetches the IP in a hex form.
! function getIPEncoded()
{
$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : $REMOTE_ADDR;
--- 69,73 ----
// Taken from phpBB2. Fetches the IP in a hex form.
! function get_ip_encoded()
{
$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : $REMOTE_ADDR;
***************
*** 84,88 ****
// Taken from phpBB2. Decodes a hexed IP.
! function decodeIP($encoded_ip)
{
$hexipbang = explode('.', chunk_split($encoded_ip, 2, '.'));
--- 84,88 ----
// Taken from phpBB2. Decodes a hexed IP.
! function decode_ip($encoded_ip)
{
$hexipbang = explode('.', chunk_split($encoded_ip, 2, '.'));
|
|
From: Brian R. <hei...@us...> - 2003-06-29 18:33:24
|
Update of /cvsroot/phpmp/phpMP/dba
In directory sc8-pr-cvs1:/tmp/cvs-serv4663/dba
Modified Files:
mssql.dba mysql.dba
Log Message:
Updating function names.
Index: mssql.dba
===================================================================
RCS file: /cvsroot/phpmp/phpMP/dba/mssql.dba,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mssql.dba 29 Jun 2003 08:19:55 -0000 1.3
--- mssql.dba 29 Jun 2003 18:33:21 -0000 1.4
***************
*** 86,90 ****
}
! function numRows($qry)
{
if ($this->ident_link == 0)
--- 86,90 ----
}
! function num_rows($qry)
{
if ($this->ident_link == 0)
***************
*** 130,134 ****
}
! function fetchArray($qry)
{
if ($this->ident_link == 0)
--- 130,134 ----
}
! function fetch_array($qry)
{
if ($this->ident_link == 0)
***************
*** 152,156 ****
}
! function fetchRow($qry)
{
if ($this->ident_link == 0)
--- 152,156 ----
}
! function fetch_row($qry)
{
if ($this->ident_link == 0)
***************
*** 174,178 ****
}
! function escapeString($string)
{
if( stripslashes($string) == $string ) // Will be true if no slashes were removed.
--- 174,178 ----
}
! function escape_string($string)
{
if( stripslashes($string) == $string ) // Will be true if no slashes were removed.
Index: mysql.dba
===================================================================
RCS file: /cvsroot/phpmp/phpMP/dba/mysql.dba,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** mysql.dba 29 Jun 2003 08:19:55 -0000 1.25
--- mysql.dba 29 Jun 2003 18:33:21 -0000 1.26
***************
*** 93,97 ****
}
! function numRows ($query)
{
if ( $this->ident_link == 0 )
--- 93,97 ----
}
! function num_rows ($query)
{
if ( $this->ident_link == 0 )
***************
*** 109,113 ****
}
! function insertID()
{
if($this->ident_link == 0)
--- 109,113 ----
}
! function insert_id()
{
if($this->ident_link == 0)
***************
*** 125,129 ****
}
! function result ( $result, $row=0, $field='' )
{
if($this->ident_link == 0)
--- 125,129 ----
}
! function result( $result, $row=0, $field='' )
{
if($this->ident_link == 0)
***************
*** 140,144 ****
}
! function fetchArray($query)
{
if($this->ident_link == 0)
--- 140,144 ----
}
! function fetch_array($query)
{
if($this->ident_link == 0)
***************
*** 154,158 ****
}
! function fetchAssoc($query)
{
if($this->ident_link == 0)
--- 154,158 ----
}
! function fetch_assoc($query)
{
if($this->ident_link == 0)
***************
*** 168,172 ****
}
! function fetchRow($query)
{
if ( $this->ident_link == 0 )
--- 168,172 ----
}
! function fetch_row($query)
{
if ( $this->ident_link == 0 )
***************
*** 183,187 ****
}
! function affectedRows() {
if($this->ident_link == 0)
{
--- 183,187 ----
}
! function affected_rows() {
if($this->ident_link == 0)
{
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:40:53
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv27574
Modified Files:
template.php
Log Message:
One last try.
Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** template.php 29 Jun 2003 08:32:12 -0000 1.40
--- template.php 29 Jun 2003 08:33:38 -0000 1.41
***************
*** 359,363 ****
$template_php = '';
! for ($i = 0; $i < count($text_blocks); $i++)
{
$trim_check_text = trim($text_blocks[$i]);
--- 359,363 ----
$template_php = '';
! for ($i = 1; $i < count($text_blocks); $i++)
{
$trim_check_text = trim($text_blocks[$i]);
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:34:40
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv27653
Modified Files:
template.php
Log Message:
Oh well.
Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** template.php 29 Jun 2003 08:33:38 -0000 1.41
--- template.php 29 Jun 2003 08:34:37 -0000 1.42
***************
*** 290,294 ****
$compile_blocks = array();
! for ($curr_tb = 1; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
--- 290,294 ----
$compile_blocks = array();
! for ($curr_tb = 0; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
***************
*** 359,363 ****
$template_php = '';
! for ($i = 1; $i < count($text_blocks); $i++)
{
$trim_check_text = trim($text_blocks[$i]);
--- 359,363 ----
$template_php = '';
! for ($i = 0; $i < count($text_blocks); $i++)
{
$trim_check_text = trim($text_blocks[$i]);
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:32:15
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv27390
Modified Files:
template.php
Log Message:
Trying something GPHemsley suggested (again).
Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** template.php 29 Jun 2003 08:29:55 -0000 1.39
--- template.php 29 Jun 2003 08:32:12 -0000 1.40
***************
*** 290,294 ****
$compile_blocks = array();
! /*for ($curr_tb = 0; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
--- 290,294 ----
$compile_blocks = array();
! for ($curr_tb = 1; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
***************
*** 356,360 ****
break;
}
! }*/
$template_php = '';
--- 356,360 ----
break;
}
! }
$template_php = '';
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:29:58
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv27082
Modified Files:
template.php
Log Message:
Trying something GPHemsley suggested.
Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** template.php 29 Jun 2003 08:19:55 -0000 1.38
--- template.php 29 Jun 2003 08:29:55 -0000 1.39
***************
*** 290,294 ****
$compile_blocks = array();
! for ($curr_tb = 0; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
--- 290,294 ----
$compile_blocks = array();
! /*for ($curr_tb = 0; $curr_tb < count($text_blocks); $curr_tb++)
{
switch ($blocks[1][$curr_tb])
***************
*** 356,360 ****
break;
}
! }
$template_php = '';
--- 356,360 ----
break;
}
! }*/
$template_php = '';
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:29:26
|
Update of /cvsroot/phpmp/phpMP/templates/BlueMP
In directory sc8-pr-cvs1:/tmp/cvs-serv27061
Modified Files:
left_column.html
Log Message:
Making login possible.
Index: left_column.html
===================================================================
RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/left_column.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** left_column.html 29 Jun 2003 05:53:24 -0000 1.2
--- left_column.html 29 Jun 2003 08:29:24 -0000 1.3
***************
*** 21,28 ****
<div class="boxheader">{L_USER_SETTINGS}</div>
<div class="boxcontent">
! <form action="login" method="post">
! <div>{L_USERNAME}: <input type="text" name="username" value="" style="width: 100px;" /></div>
! <div>{L_PASSWORD}: <input type="password" name="password" value="" style="width: 100px;" /></div>
! <div><input type="submit" name="login" value="Logon!" /></div>
</form>
</div>
--- 21,29 ----
<div class="boxheader">{L_USER_SETTINGS}</div>
<div class="boxcontent">
! <form method="post" action="index.php">
! <div>{L_USERNAME}: <input type="text" name="login_username" value="" style="width: 100px;" /></div>
! <div>{L_PASSWORD}: <input type="password" name="login_passwd" value="" style="width: 100px;" /></div>
! <div><input type="submit" name="login" value="{L_LOGIN}" /></div>
! <input name="do_login" type="hidden" id="do_login" value="1" />
</form>
</div>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:19:59
|
Update of /cvsroot/phpmp/phpMP/templates/BlueMP
In directory sc8-pr-cvs1:/tmp/cvs-serv26138/templates/BlueMP
Modified Files:
index.html
Log Message:
Stupid line breaks. Why can't Windows and Mac standardize?
Index: index.html
===================================================================
RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/index.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** index.html 29 Jun 2003 05:53:24 -0000 1.3
--- index.html 29 Jun 2003 08:19:56 -0000 1.4
***************
*** 1,27 ****
! <div id="contentboxes">
! <div class="boxheader">» {L_WELCOME_TO} {C_SITE_NAME}</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">Articles</div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
!
! <div id="footer">
! Copyright © 2003
! </div>
</div>
--- 1,27 ----
! <div id="contentboxes">
! <div class="boxheader">» {L_WELCOME_TO} {C_SITE_NAME}</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">Articles</div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
! <div class="boxheader">» Article</div>
! <div class="boxcontent">
! <p>blah blah blah blah</p>
! </div>
!
! <div id="footer">
! {L_POWERED_BY}<br />{L_COPYRIGHT}
! </div>
</div>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:19:58
|
Update of /cvsroot/phpmp/phpMP/languages/french
In directory sc8-pr-cvs1:/tmp/cvs-serv26138/languages/french
Modified Files:
lang_main.php
Log Message:
Stupid line breaks. Why can't Windows and Mac standardize?
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/languages/french/lang_main.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** lang_main.php 17 May 2003 07:50:17 -0000 1.8
--- lang_main.php 29 Jun 2003 08:19:56 -0000 1.9
***************
*** 1,88 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class Localization
! {
!
! var $lang;
!
! function Localization()
! {
!
! $this->lang = array(
!
! //
! // General language used throughout site.
! //
! // Note: Always escape single quote characters (') with a backslash (\).
! //
! 'L_Welcome_to_Site' => 'Bienvenue chez ' . C_SITE_NAME . '!',
! 'L_Home' => 'Accueil',
! 'L_Profile' => 'Profil',
! 'L_Modules' => 'Modules',
! 'L_Downloads' => 'Téléchargements',
! 'L_Username' => 'Nom d\'usager',
! 'L_User_CP' => 'User CP',
! 'L_User_Control_Panel' => 'Votre panneau de commande',
! 'L_E-mail' => 'Courriel',
! 'L_Password' => 'Mot de passe',
! 'L_Comfirm' => 'Confirmez',
! 'L_Real Name' => 'Prénom et Nom',
! 'L_Location' => 'Location',
! 'L_Register' => 'Enregistrer',
! 'L_Welcome' => 'Bienvenue',
!
! 'L_Administration_Area' => 'Section Administrative',
! 'L_Register_a_Username' => 'Enregistrez votre nom d\'usager',
!
!
! //
! // Below is language used almost specifically for auth.
! //
! 'L_Login' => 'Ouvrir session',
! 'L_Logout' => 'Fermer session',
!
! 'L_Account_Activated' => 'Votre compte a été activé. Vous pouvez maintenant ouvrir une session.',
! 'L_Required_Field' => 'Ceci dénote de l\'information requise pour votre enregistrement',
! 'L_Register_Finished' => 'Votre enregistrement a été traité. Un courriel expliquant l\'activation de votre compte sera envoyé à l\'adresse soumisse sous peu.',
! 'L_Forgot_Password' => 'Avez-vous oubliez votre mot de pass?',
! 'L_Not_logged_in' => 'Veuillez ouvrir une session via votre compte personel.',
!
!
! //
! // Other various parts of the templates.
! //
! 'L_Powered_by_phpMP' => 'Actionné par phpMP ' . C_VERSION . ' © 2002 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
! 'L_Copyright' => 'Tout le contenu de se site est la propriété du propriétaire respectif. Tous droits réservés.'
!
! // It is IMPERATIVE that the last array value entered (usually the copyright)
! // does not end in a comma.
!
! );
!
! }
!
! }
!
?>
--- 1,88 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class Localization
! {
!
! var $lang;
!
! function Localization()
! {
!
! $this->lang = array(
!
! //
! // General language used throughout site.
! //
! // Note: Always escape single quote characters (') with a backslash (\).
! //
! 'L_Welcome_to_Site' => 'Bienvenue chez ' . C_SITE_NAME . '!',
! 'L_Home' => 'Accueil',
! 'L_Profile' => 'Profil',
! 'L_Modules' => 'Modules',
! 'L_Downloads' => 'Téléchargements',
! 'L_Username' => 'Nom d\'usager',
! 'L_User_CP' => 'User CP',
! 'L_User_Control_Panel' => 'Votre panneau de commande',
! 'L_E-mail' => 'Courriel',
! 'L_Password' => 'Mot de passe',
! 'L_Comfirm' => 'Confirmez',
! 'L_Real Name' => 'Prénom et Nom',
! 'L_Location' => 'Location',
! 'L_Register' => 'Enregistrer',
! 'L_Welcome' => 'Bienvenue',
!
! 'L_Administration_Area' => 'Section Administrative',
! 'L_Register_a_Username' => 'Enregistrez votre nom d\'usager',
!
!
! //
! // Below is language used almost specifically for auth.
! //
! 'L_Login' => 'Ouvrir session',
! 'L_Logout' => 'Fermer session',
!
! 'L_Account_Activated' => 'Votre compte a été activé. Vous pouvez maintenant ouvrir une session.',
! 'L_Required_Field' => 'Ceci dénote de l\'information requise pour votre enregistrement',
! 'L_Register_Finished' => 'Votre enregistrement a été traité. Un courriel expliquant l\'activation de votre compte sera envoyé à l\'adresse soumisse sous peu.',
! 'L_Forgot_Password' => 'Avez-vous oubliez votre mot de pass?',
! 'L_Not_logged_in' => 'Veuillez ouvrir une session via votre compte personel.',
!
!
! //
! // Other various parts of the templates.
! //
! 'L_Powered_by_phpMP' => 'Actionné par phpMP ' . C_VERSION . ' © 2002 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
! 'L_Copyright' => 'Tout le contenu de se site est la propriété du propriétaire respectif. Tous droits réservés.'
!
! // It is IMPERATIVE that the last array value entered (usually the copyright)
! // does not end in a comma.
!
! );
!
! }
!
! }
!
?>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:19:58
|
Update of /cvsroot/phpmp/phpMP/languages/english
In directory sc8-pr-cvs1:/tmp/cvs-serv26138/languages/english
Modified Files:
lang_main.php
Log Message:
Stupid line breaks. Why can't Windows and Mac standardize?
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/languages/english/lang_main.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** lang_main.php 29 Jun 2003 05:53:24 -0000 1.22
--- lang_main.php 29 Jun 2003 08:19:56 -0000 1.23
***************
*** 1,88 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class Localization
! {
!
! var $lang;
!
! function Localization()
! {
! global $Config;
!
! $this->lang = array(
!
! //
! // General language used throughout site.
! //
! // Note: Always escape single quote characters (') with a backslash (\).
! //
! 'WELCOME_TO' => 'Welcome to ',
! 'HOME' => 'Home',
! 'PROFILE' => 'Profile',
! 'MODULES' => 'Modules',
! 'DOWNLOADS' => 'Downloads',
! 'USERNAME' => 'Username',
! 'USER_CP' => 'User CP',
! 'USER_CONTROL_PANEL' => 'User Control Panel',
! 'E_MAIL' => 'E-mail',
! 'PASSWORD' => 'Password',
! 'CONFIRM' => 'Confirm',
! 'REAL_NAME' => 'Real Name',
! 'LOCATION' => 'Location',
! 'REGISTER' => 'Register',
!
! 'ADMINISTRATION AREA' => 'Administration Area',
! 'REGISTER_A_USERNAME' => 'Register a Username',
!
!
! //
! // Below is language used almost specifically for auth.
! //
! 'LOGIN' => 'Login',
! 'LOGOUT' => 'Logout',
!
! 'ACCOUNT_ACTIVATED' => 'Your account has been activated. You may now log in.',
! 'REQUIRED_FIELD' => 'Denotes a Required Field',
! 'REGISTER_FINISHED' => 'Your registration has been processed. Please check your e-mail for a message explaining how to activate your new account.',
! 'FORGOT_PASSWORD' => 'Forgot Your Password?',
! 'NOT_LOGGED_IN' => 'You are not logged in.',
!
!
! //
! // Other various parts of the templates.
! //
! 'POWERED_BY' => 'powered by phpMP ' . $Config->get('version') . ' © 2002 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
! 'COPYRIGHT' => 'All content is property of its respective owner. All rights reserved.'
!
! // It is IMPERATIVE that the last array value entered (usually the copyright)
! // does not end in a comma.
!
! );
!
! }
!
! }
!
?>
--- 1,90 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class Localization
! {
!
! var $lang;
!
! function Localization()
! {
! global $Config;
!
! $this->lang = array(
!
! //
! // General language used throughout site.
! //
! // Note: Always escape single quote characters (') with a backslash (\).
! //
! 'WELCOME_TO' => 'Welcome to ',
! 'HOME' => 'Home',
! 'PROFILE' => 'Profile',
! 'MODULES' => 'Modules',
! 'DOWNLOADS' => 'Downloads',
! 'USERNAME' => 'Username',
! 'USER_CP' => 'User CP',
! 'USER_CONTROL_PANEL' => 'User Control Panel',
! 'E_MAIL' => 'E-mail',
! 'PASSWORD' => 'Password',
! 'CONFIRM' => 'Confirm',
! 'REAL_NAME' => 'Real Name',
! 'LOCATION' => 'Location',
! 'REGISTER' => 'Register',
! 'MAIN_MENU' => 'Main Menu',
! 'USER_SETTINGS' => 'User Settings',
!
! 'ADMINISTRATION AREA' => 'Administration Area',
! 'REGISTER_A_USERNAME' => 'Register a Username',
!
!
! //
! // Below is language used almost specifically for auth.
! //
! 'LOGIN' => 'Login',
! 'LOGOUT' => 'Logout',
!
! 'ACCOUNT_ACTIVATED' => 'Your account has been activated. You may now log in.',
! 'REQUIRED_FIELD' => 'Denotes a Required Field',
! 'REGISTER_FINISHED' => 'Your registration has been processed. Please check your e-mail for a message explaining how to activate your new account.',
! 'FORGOT_PASSWORD' => 'Forgot Your Password?',
! 'NOT_LOGGED_IN' => 'You are not logged in.',
!
!
! //
! // Other various parts of the templates.
! //
! 'POWERED_BY' => 'powered by phpMP ' . $Config->get('version') . ' © 2003 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
! 'COPYRIGHT' => 'All content is property of its respective owner. All rights reserved.'
!
! // It is IMPERATIVE that the last array value entered (usually the copyright)
! // does not end in a comma.
!
! );
!
! }
!
! }
!
?>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:19:58
|
Update of /cvsroot/phpmp/phpMP/docs In directory sc8-pr-cvs1:/tmp/cvs-serv26138/docs Modified Files: Changelog Log Message: Stupid line breaks. Why can't Windows and Mac standardize? Index: Changelog =================================================================== RCS file: /cvsroot/phpmp/phpMP/docs/Changelog,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** Changelog 19 May 2003 23:58:07 -0000 1.38 --- Changelog 29 Jun 2003 08:19:55 -0000 1.39 *************** *** 1,382 **** ! 2003-05-19 [Heimidal] ! * module.php ! Began work and planning on the module system. ! * includes/config.init.php ! * includes/template.php ! * includes/user.php ! Changed a bit of regex syntax. We're now using ! preg_match instead of eregi (as per some speed ! advice from a friend). ! ! 2003-05-17 [Heimidal] ! * includes/core.php ! * includes/config.init.php **NEW** ! Moved the Config class to its own file. ! * includes/Smarty.class.php **REMOVED** ! * includes/Smart_Compiler.class.php **REMOVED** ! * includes/Config_File.class.php **REMOVED** ! * includes/plugins/ **REMOVED** ! Removed all remnant Smarty files. We'll design ! our own template engine. ! ! 2003-05-12 [Heimidal] ! * includes/session.php ! Added support for per-session invisible use mode. ! This allows a user to not show up in the Who's ! Online listing (which hasn't been written yet). ! Invisible mode remains persistent if auto-login ! is utilized (spanning multiple sessions, obviously). ! ! 2003-05-09 [Heimidal] ! * almost all files (so check them all) ! $Config is now located in its own object. ! All Config, User, and Template array values are ! henceforth unaccessible by means of direct access. ! You must use the $ObjectName->get() and set() ! functions in order to access this data. Currently, ! the set() function in both the $User and $Template ! classes accepts both singular values as well as an ! associative array of values. The $Config class ! does not, however. ! Finally, value names must begin with a letter, ! can contain all letters, numbers, dashes (-), and ! underscores (_). In addition, , with the exception ! of the $Template class, value names are no longer ! case sensitive. ! ! 2003-05-08 [Heimidal] ! * includes/template.php ! * includes/core.php ! Working on the template system. You can now ! assign template vars to the $tplvars array. ! ! 2003-05-04 [Heimidal] ! * includes/template.php ! * includes/core.php ! Globalized a few variables and fixed the way a ! var was declared. ! Ensured that the correct number of variables were ! specified in a function call to template. ! * includes/session.php ! * includes/constants.php ! Added an entry to the constants file for ! 'ANONYMOUS' so the user_id for the anonymous user ! can be quickly edited in the future. ! ! 2003-05-02 [AnthonyWhite] ! * includes/mpcode.php ! * includes/mpcode_arrays.php ! I got more work done on the MPCode system today, ! and it seems to be working great. ! I just need to add support for the harder mpcodes ! such as [url=] and [email=]. ! Hopefully I will have a complete system by the end ! of next week :) ! ! 2003-05-01 [Heimidal] ! * includes/debug.php ! * includes/core.php ! Began work on debug/error handling. ! * includes/session.php ! * includes/session.php ! * login_test.php ! * includes/user.php ! Autologin now works as I expect it to. ! Cleanup of sessions is more reliable. ! ! 2003-05-01 [AnthonyWhite] ! * includes/mpcode.php ! Added a mpcode class to handle parsing of mpcode. ! * includes/mpcode_arrays.php **NEW** ! Contains mpcode syntax array with corresponding html ! syntax array. ! ! 2003-04-23 ! * session.php ! Added support for decoding our hexed IPs. ! * dba/sql/mysql_structure.sql ! * dba/sql/mysql_default_vals.sql ! Updated the table definitions. ! ! 2003-04-23 [Heimidal] ! * index.php ! * login_test.php ! * includes/sessions.php **REMOVED** ! * includes/session.php **NEW** ! * includes/user.php ! * includes/core.php ! * includes/functions.php ! * includes/language.php ! * includes/auth.php **REMOVED** ! The session/login system now works as I expect it to. ! All config settings are now housed in $Config. ! You MUST globalize $Config in each new class. ! The Auth class has bee removed, in favor of the ! User class. ! ! 2003-02-18 [AnthonyWhite] ! * includes/admin.php ! Changed some tabs because of my new editor ! ! 2003-02-14 [AnthonyWhite] ! * dba/mssql.dba **NEW** ! Added support for Microsoft SQL databases ! ! 2003-02-11 [AnthonyWhite] ! * admin/main.php ! Fixed a few issues regarding parsing multiple forms ! * includes/admin.php ! Added support for complete user management ! Having a few problems, but I will fix them soon ! ! 2003-02-10 [AnthonyWhite] ! * includes/admin.php ! Started on User Management ! * admin/main.php ! * admin/nav.php ! * admin/index.php ! ! 2003-02-09 [AnthonyWhite] ! * includes/admin.php ! Added timezone dropdown ! Doesnt select timezone, it is displayed beside box ! ! 2003-02-09 [AnthonyWhite] ! * includes/admin.php ! Minor changes with site config form ! ! 2003-02-09 [Heimidal] ! * includes/constants.php ! Added timezones. ! ! 2003-02-09 [AnthonyWhite] ! * admin/main.php ! Changed the panel handling once again ! Not a big change - just got rid of if statement ! * admin/nav.php ! Nothing special, just changed a link's text ! * includes/admin.php ! Handles site configuration fully now ! outputs a form and handles it (for site config) ! Site config functions are basis for others now ! ! 2003-02-09 [AnthonyWhite] ! * admin/main.php ! Changed the way the panel is handled. ! May not be the best, but it works ! * includes/admin.php **NEW** ! Class file - Backend for the admin panel ! ! 2003-02-08 [AnthonyWhite] ! * admin/main.php **NEW** ! The main page for the admin panel, will show site stats ! Controlled by a switch / case statement (not best way) ! I will probably change the way this is eventually ! * admin/nav.php ! Just added a link for testing ! * admin/index.php ! Changed the frameset a bit ! ! 2003-02-08 [AnthonyWhite] ! * admin/index.php ! My first commit :) ! I am basically just starting on the admin panel here. ! So far, I have a basic layout with frames and so on. ! * admin/nav.php **NEW** ! Just a basic navigation file for the admin panel. ! If you dont like what I did just let me know, ! otherwise I will just continue on. ! ! 2003-02-08 [Heimidal] ! * A LOT of files. ! Dreamweaver changed \r\n to \r. That's fixed. ! Started moving includes around in core.php. ! Making the loading structure of files logical. ! constant.php actually contains 'constants' now. ! Began serious work on sessions.php. ! Auth will be called by sessions.php henceforth. ! ! 2003-02-05 [Heimidal] ! * Most included files. ! Changed DB table to carry a DB_ prefix. ! Fixed a mistake I made in constants.php. ! ! 2003-02-03 [Heimidal] ! ! * Every file I can think of. ! Changed <? to <?php for compatibility. ! Changed a few config values and such. ! ! 2003-02-03 [Heimidal] ! ! * includes/user.php ! * includes/auth.php ! Fixed a few small problems. ! ! 2003-01-31 [Heimidal] ! ! * dba/mysql.dba ! Added escapeString() function. ! * includes/user.php ! Added the escapeString() call to usernames. ! ! 2003-01-14 [Heimidal] ! ! * includes/user.php ! Continuing my update to the Authentication system. ! ! 2002-12-07 [Heimidal] ! ! * dba/sql/mysql_default_vals.sql ! Removed the date format for the Anon user. ! Added a 'T' to the default date format (timezone). ! ! 2002-12-07 [Heimidal] ! ! * index.php ! Missed the addition of 'C_' on a config variable. ! ! 2002-12-05 [Heimidal] ! ! * dba/sql/mysql_default_vals.sql ! * includes/user.php ! Changed the Anonymous user back to userid=1. ! ! 2002-12-04 [Heimidal] ! ! * all php files ! Added 'C_' to all config values not involving the DB. ! ! 2002-12-04 [Heimidal] ! ! * languages/english/lang_main.php ! * languages/french/lang_main.php ! Forgot $this->, changing the depth of the $lang var. ! ! 2002-12-04 [TopherCoS] ! ! * languages/english/lang_main.php ! * languages/french/lang_main.php ! Escape more single-quotes neeeding escaping (fr) ! Aesthetic cleanups ! Convert fr language file to new format ! ! 2002-12-03 [Heimidal] ! ! * includes/constants.php ! * includes/user.php ! * includes/auth.php ! Continuous updates to the auth system. ! 2002-12-02 [Heimidal] ! ! * dba/sql/mysql_structure.sql ! Updates to DB structure. ! * dba/sql/mysql_default_vals.sql ! Updates to default MySQL table values. ! ! 2002-12-02 [Heimidal] ! ! * languages/english/lang_main.php ! Altered the way in which the lang array is defined. ! * includes/core.php ! * includes/functions.php ! * includes/constants.php ! Begin arranging and declaring constants. ! * includes/template.php ! * includes/user.php ! To be logical, U_ will now prefix user vars. ! User variables will not be defined if empty. ! Anonymous user now carries a User ID of -1. ! ! 2002-12-02 [Heimidal] ! ! * includes/core.php ! Added an 's' to SESSIONS_TABLE. ! * includes/user.php ! Keep work up on the auth system. ! * dba/sql/mysql_default_vals.sql ! Changed a few defaults to reflect typical setups. ! ! ! ! 2002-12-02 [Heimidal] ! ! * index.php ! * includes/core.php ! Attempt to comply with coding standards. ! * includes/language.php ! Fixed inclusion of main language file. ! ! 2002-12-02 [Heimidal] ! ! * templates/TealMP/compile/ **NEW** ! * templates/TealMP/configs/ **NEW** ! ! 2002-12-02 [TopherCoS] ! ! * languages/french/lang_main.php **NEW** ! Added French language support ! ! 2002-12-02 [Heimidal] ! ! * includes/auth.php ! * includes/user.php ! Started work on the Auth system. ! * includes/language.php ! Changed the way language class works. ! * languages/english/lang_main.php ! Reformatted the language file for better use. ! * includes/debug.php **NEW** ! Just laying stuff out. ! ! 2002-12-02 [TopherCoS] ! ! * languages/english/lang_main.php ! Fix another minor typo I missed earlier ! ! 2002-12-02 [TopherCoS] ! ! * languages/english/lang_main.php ! Fix a minor typo ! ! 2002-12-02 [TopherCoS] ! ! * Changelog **NEW** ! Added Changelog to help keep track of changes ! * Format ! Entries begin with date in YYYY-MM-DD ! One <TAB> after the date followed by the SF username in ! brackets ! Optionally the software version number seperated by one ! <TAB> ! One empty line ! One <TAB> followed by "* dir/filename.php" ! One <TAB> then "**NEW** if a new file ! Next line is two <TAB>s followed by a concise description ! of the changes. ! Text should not wrap, nor should it extend beyond 80 ! characters on a single line. ! Entries seperated by an empty line ! Added a couple of extra entries to help illustrate format ! ! 2002-12-02 [heimidal] ! ! * includes/core.php ! Ugh. Stupid mistake ! ! 2002-12-02 [heimidal] ! ! * includes/core.php ! Fixed a few small errors ! ! 2002-12-02 [heimidal] ! ! * index.php ! * includes/auth.php ! * includes/core.php ! * includes/user.php **NEW** ! Made use of files within hierarchy much easier. ! Seperated User and Auth so we aren't forced into ! loading Auth. ! Started writing a basic auth system (though the ! parts written are contained in User) --- 1,382 ---- ! 2003-05-19 [Heimidal] ! * module.php ! Began work and planning on the module system. ! * includes/config.init.php ! * includes/template.php ! * includes/user.php ! Changed a bit of regex syntax. We're now using ! preg_match instead of eregi (as per some speed ! advice from a friend). ! ! 2003-05-17 [Heimidal] ! * includes/core.php ! * includes/config.init.php **NEW** ! Moved the Config class to its own file. ! * includes/Smarty.class.php **REMOVED** ! * includes/Smart_Compiler.class.php **REMOVED** ! * includes/Config_File.class.php **REMOVED** ! * includes/plugins/ **REMOVED** ! Removed all remnant Smarty files. We'll design ! our own template engine. ! ! 2003-05-12 [Heimidal] ! * includes/session.php ! Added support for per-session invisible use mode. ! This allows a user to not show up in the Who's ! Online listing (which hasn't been written yet). ! Invisible mode remains persistent if auto-login ! is utilized (spanning multiple sessions, obviously). ! ! 2003-05-09 [Heimidal] ! * almost all files (so check them all) ! $Config is now located in its own object. ! All Config, User, and Template array values are ! henceforth unaccessible by means of direct access. ! You must use the $ObjectName->get() and set() ! functions in order to access this data. Currently, ! the set() function in both the $User and $Template ! classes accepts both singular values as well as an ! associative array of values. The $Config class ! does not, however. ! Finally, value names must begin with a letter, ! can contain all letters, numbers, dashes (-), and ! underscores (_). In addition, , with the exception ! of the $Template class, value names are no longer ! case sensitive. ! ! 2003-05-08 [Heimidal] ! * includes/template.php ! * includes/core.php ! Working on the template system. You can now ! assign template vars to the $tplvars array. ! ! 2003-05-04 [Heimidal] ! * includes/template.php ! * includes/core.php ! Globalized a few variables and fixed the way a ! var was declared. ! Ensured that the correct number of variables were ! specified in a function call to template. ! * includes/session.php ! * includes/constants.php ! Added an entry to the constants file for ! 'ANONYMOUS' so the user_id for the anonymous user ! can be quickly edited in the future. ! ! 2003-05-02 [AnthonyWhite] ! * includes/mpcode.php ! * includes/mpcode_arrays.php ! I got more work done on the MPCode system today, ! and it seems to be working great. ! I just need to add support for the harder mpcodes ! such as [url=] and [email=]. ! Hopefully I will have a complete system by the end ! of next week :) ! ! 2003-05-01 [Heimidal] ! * includes/debug.php ! * includes/core.php ! Began work on debug/error handling. ! * includes/session.php ! * includes/session.php ! * login_test.php ! * includes/user.php ! Autologin now works as I expect it to. ! Cleanup of sessions is more reliable. ! ! 2003-05-01 [AnthonyWhite] ! * includes/mpcode.php ! Added a mpcode class to handle parsing of mpcode. ! * includes/mpcode_arrays.php **NEW** ! Contains mpcode syntax array with corresponding html ! syntax array. ! ! 2003-04-23 ! * session.php ! Added support for decoding our hexed IPs. ! * dba/sql/mysql_structure.sql ! * dba/sql/mysql_default_vals.sql ! Updated the table definitions. ! ! 2003-04-23 [Heimidal] ! * index.php ! * login_test.php ! * includes/sessions.php **REMOVED** ! * includes/session.php **NEW** ! * includes/user.php ! * includes/core.php ! * includes/functions.php ! * includes/language.php ! * includes/auth.php **REMOVED** ! The session/login system now works as I expect it to. ! All config settings are now housed in $Config. ! You MUST globalize $Config in each new class. ! The Auth class has bee removed, in favor of the ! User class. ! ! 2003-02-18 [AnthonyWhite] ! * includes/admin.php ! Changed some tabs because of my new editor ! ! 2003-02-14 [AnthonyWhite] ! * dba/mssql.dba **NEW** ! Added support for Microsoft SQL databases ! ! 2003-02-11 [AnthonyWhite] ! * admin/main.php ! Fixed a few issues regarding parsing multiple forms ! * includes/admin.php ! Added support for complete user management ! Having a few problems, but I will fix them soon ! ! 2003-02-10 [AnthonyWhite] ! * includes/admin.php ! Started on User Management ! * admin/main.php ! * admin/nav.php ! * admin/index.php ! ! 2003-02-09 [AnthonyWhite] ! * includes/admin.php ! Added timezone dropdown ! Doesnt select timezone, it is displayed beside box ! ! 2003-02-09 [AnthonyWhite] ! * includes/admin.php ! Minor changes with site config form ! ! 2003-02-09 [Heimidal] ! * includes/constants.php ! Added timezones. ! ! 2003-02-09 [AnthonyWhite] ! * admin/main.php ! Changed the panel handling once again ! Not a big change - just got rid of if statement ! * admin/nav.php ! Nothing special, just changed a link's text ! * includes/admin.php ! Handles site configuration fully now ! outputs a form and handles it (for site config) ! Site config functions are basis for others now ! ! 2003-02-09 [AnthonyWhite] ! * admin/main.php ! Changed the way the panel is handled. ! May not be the best, but it works ! * includes/admin.php **NEW** ! Class file - Backend for the admin panel ! ! 2003-02-08 [AnthonyWhite] ! * admin/main.php **NEW** ! The main page for the admin panel, will show site stats ! Controlled by a switch / case statement (not best way) ! I will probably change the way this is eventually ! * admin/nav.php ! Just added a link for testing ! * admin/index.php ! Changed the frameset a bit ! ! 2003-02-08 [AnthonyWhite] ! * admin/index.php ! My first commit :) ! I am basically just starting on the admin panel here. ! So far, I have a basic layout with frames and so on. ! * admin/nav.php **NEW** ! Just a basic navigation file for the admin panel. ! If you dont like what I did just let me know, ! otherwise I will just continue on. ! ! 2003-02-08 [Heimidal] ! * A LOT of files. ! Dreamweaver changed \r\n to \r. That's fixed. ! Started moving includes around in core.php. ! Making the loading structure of files logical. ! constant.php actually contains 'constants' now. ! Began serious work on sessions.php. ! Auth will be called by sessions.php henceforth. ! ! 2003-02-05 [Heimidal] ! * Most included files. ! Changed DB table to carry a DB_ prefix. ! Fixed a mistake I made in constants.php. ! ! 2003-02-03 [Heimidal] ! ! * Every file I can think of. ! Changed <? to <?php for compatibility. ! Changed a few config values and such. ! ! 2003-02-03 [Heimidal] ! ! * includes/user.php ! * includes/auth.php ! Fixed a few small problems. ! ! 2003-01-31 [Heimidal] ! ! * dba/mysql.dba ! Added escapeString() function. ! * includes/user.php ! Added the escapeString() call to usernames. ! ! 2003-01-14 [Heimidal] ! ! * includes/user.php ! Continuing my update to the Authentication system. ! ! 2002-12-07 [Heimidal] ! ! * dba/sql/mysql_default_vals.sql ! Removed the date format for the Anon user. ! Added a 'T' to the default date format (timezone). ! ! 2002-12-07 [Heimidal] ! ! * index.php ! Missed the addition of 'C_' on a config variable. ! ! 2002-12-05 [Heimidal] ! ! * dba/sql/mysql_default_vals.sql ! * includes/user.php ! Changed the Anonymous user back to userid=1. ! ! 2002-12-04 [Heimidal] ! ! * all php files ! Added 'C_' to all config values not involving the DB. ! ! 2002-12-04 [Heimidal] ! ! * languages/english/lang_main.php ! * languages/french/lang_main.php ! Forgot $this->, changing the depth of the $lang var. ! ! 2002-12-04 [TopherCoS] ! ! * languages/english/lang_main.php ! * languages/french/lang_main.php ! Escape more single-quotes neeeding escaping (fr) ! Aesthetic cleanups ! Convert fr language file to new format ! ! 2002-12-03 [Heimidal] ! ! * includes/constants.php ! * includes/user.php ! * includes/auth.php ! Continuous updates to the auth system. ! 2002-12-02 [Heimidal] ! ! * dba/sql/mysql_structure.sql ! Updates to DB structure. ! * dba/sql/mysql_default_vals.sql ! Updates to default MySQL table values. ! ! 2002-12-02 [Heimidal] ! ! * languages/english/lang_main.php ! Altered the way in which the lang array is defined. ! * includes/core.php ! * includes/functions.php ! * includes/constants.php ! Begin arranging and declaring constants. ! * includes/template.php ! * includes/user.php ! To be logical, U_ will now prefix user vars. ! User variables will not be defined if empty. ! Anonymous user now carries a User ID of -1. ! ! 2002-12-02 [Heimidal] ! ! * includes/core.php ! Added an 's' to SESSIONS_TABLE. ! * includes/user.php ! Keep work up on the auth system. ! * dba/sql/mysql_default_vals.sql ! Changed a few defaults to reflect typical setups. ! ! ! ! 2002-12-02 [Heimidal] ! ! * index.php ! * includes/core.php ! Attempt to comply with coding standards. ! * includes/language.php ! Fixed inclusion of main language file. ! ! 2002-12-02 [Heimidal] ! ! * templates/TealMP/compile/ **NEW** ! * templates/TealMP/configs/ **NEW** ! ! 2002-12-02 [TopherCoS] ! ! * languages/french/lang_main.php **NEW** ! Added French language support ! ! 2002-12-02 [Heimidal] ! ! * includes/auth.php ! * includes/user.php ! Started work on the Auth system. ! * includes/language.php ! Changed the way language class works. ! * languages/english/lang_main.php ! Reformatted the language file for better use. ! * includes/debug.php **NEW** ! Just laying stuff out. ! ! 2002-12-02 [TopherCoS] ! ! * languages/english/lang_main.php ! Fix another minor typo I missed earlier ! ! 2002-12-02 [TopherCoS] ! ! * languages/english/lang_main.php ! Fix a minor typo ! ! 2002-12-02 [TopherCoS] ! ! * Changelog **NEW** ! Added Changelog to help keep track of changes ! * Format ! Entries begin with date in YYYY-MM-DD ! One <TAB> after the date followed by the SF username in ! brackets ! Optionally the software version number seperated by one ! <TAB> ! One empty line ! One <TAB> followed by "* dir/filename.php" ! One <TAB> then "**NEW** if a new file ! Next line is two <TAB>s followed by a concise description ! of the changes. ! Text should not wrap, nor should it extend beyond 80 ! characters on a single line. ! Entries seperated by an empty line ! Added a couple of extra entries to help illustrate format ! ! 2002-12-02 [heimidal] ! ! * includes/core.php ! Ugh. Stupid mistake ! ! 2002-12-02 [heimidal] ! ! * includes/core.php ! Fixed a few small errors ! ! 2002-12-02 [heimidal] ! ! * index.php ! * includes/auth.php ! * includes/core.php ! * includes/user.php **NEW** ! Made use of files within hierarchy much easier. ! Seperated User and Auth so we aren't forced into ! loading Auth. ! Started writing a basic auth system (though the ! parts written are contained in User) |
|
From: Brian R. <hei...@us...> - 2003-06-29 08:19:58
|
Update of /cvsroot/phpmp/phpMP/dba
In directory sc8-pr-cvs1:/tmp/cvs-serv26138/dba
Modified Files:
mssql.dba mysql.dba
Log Message:
Stupid line breaks. Why can't Windows and Mac standardize?
Index: mssql.dba
===================================================================
RCS file: /cvsroot/phpmp/phpMP/dba/mssql.dba,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mssql.dba 17 May 2003 07:50:17 -0000 1.2
--- mssql.dba 29 Jun 2003 08:19:55 -0000 1.3
***************
*** 1,191 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class DB
! {
!
! var $ident_link;
! var $connected;
!
! function connect()
! {
! if (empty($this->ident_link))
! {
! $connection = @mssql_connect(DB_HOST, DB_USER, DB_PASSWD);
!
! if (!$connection)
! {
! $this->connected = 0;
! return 0;
! }
! else
! {
! $this->ident_link = $connection;
!
! return $this->ident_link;
! }
! }
! }
!
! function close()
! {
! if ($this->ident_link != 0)
! {
! @mssql_close($this->ident_link);
! $this->ident_link = 0;
!
! return 1;
! }
! else
! {
! return 1;
! }
! }
!
! function query($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $result = @mssql_query($qry, $db);
! return $result;
! }
! }
!
! function numRows($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $num = @mssql_num_rows($qry);
! return $num;
! }
! }
!
! function result($result, $row=0, $field='')
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $return = @mssql_result($result, $row, $field);
! return $return;
! }
! }
!
! function fetchArray($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $result = @mssql_fetch_array($qry);
! return $result;
! }
! }
!
! function fetchRow($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $result = @mssql_fetch_row($qry)
! return $result;
! }
! }
!
! function escapeString($string)
! {
! if( stripslashes($string) == $string ) // Will be true if no slashes were removed.
! {
! addslashes($string); // We'll add the slashes because they haven't already been added.
! return true;
! }
! else // Slashes have already been added (hopefully only once).
! {
! return true;
! }
! }
!
! }
!
! ?>
--- 1,191 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class DB
! {
!
! var $ident_link;
! var $connected;
!
! function connect()
! {
! if (empty($this->ident_link))
! {
! $connection = @mssql_connect(DB_HOST, DB_USER, DB_PASSWD);
!
! if (!$connection)
! {
! $this->connected = 0;
! return 0;
! }
! else
! {
! $this->ident_link = $connection;
!
! return $this->ident_link;
! }
! }
! }
!
! function close()
! {
! if ($this->ident_link != 0)
! {
! @mssql_close($this->ident_link);
! $this->ident_link = 0;
!
! return 1;
! }
! else
! {
! return 1;
! }
! }
!
! function query($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $result = @mssql_query($qry, $db);
! return $result;
! }
! }
!
! function numRows($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $num = @mssql_num_rows($qry);
! return $num;
! }
! }
!
! function result($result, $row=0, $field='')
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $return = @mssql_result($result, $row, $field);
! return $return;
! }
! }
!
! function fetchArray($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $result = @mssql_fetch_array($qry);
! return $result;
! }
! }
!
! function fetchRow($qry)
! {
! if ($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if (!$db)
! {
! return 0;
! }
! else
! {
! $result = @mssql_fetch_row($qry)
! return $result;
! }
! }
!
! function escapeString($string)
! {
! if( stripslashes($string) == $string ) // Will be true if no slashes were removed.
! {
! addslashes($string); // We'll add the slashes because they haven't already been added.
! return true;
! }
! else // Slashes have already been added (hopefully only once).
! {
! return true;
! }
! }
!
! }
!
! ?>
Index: mysql.dba
===================================================================
RCS file: /cvsroot/phpmp/phpMP/dba/mysql.dba,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** mysql.dba 17 May 2003 07:50:17 -0000 1.24
--- mysql.dba 29 Jun 2003 08:19:55 -0000 1.25
***************
*** 1,199 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class DB
! {
!
! var $ident_link;
! var $connected;
! var $query_count;
!
! function connect ()
! {
! if ( empty ($this->ident_link) )
! {
! $connection = @mysql_connect(DB_HOST, DB_USER, DB_PASSWD);
!
! if ( !$connection )
! {
! $this->connected = 0;
! return 0;
! }
! else
! {
! $this->ident_link = $connection;
!
! return $this->ident_link;
! }
! }
! else
! {
! return $this->ident_link;
! }
!
! }
!
! function close ()
! {
! if ( $this->ident_link != 0 )
! {
! @mysql_close($this->ident_link);
! $this->ident_link = 0;
!
! return 1;
! }
! else
! {
! return 1;
! }
! }
!
! function query ( $qry )
! {
! if ( $this->ident_link == 0 )
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if ( !$db )
! {
! return 0;
! }
! else
! {
! $result = @mysql_query( $qry, $db );
! $this->query_count++;
! return $result;
! }
! }
!
! function numRows ($query)
! {
! if ( $this->ident_link == 0 )
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $num = @mysql_num_rows($query);
! return $num;
!
! }
!
! function insertID()
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $num = @mysql_insert_id($this->ident_link);
! return $num;
!
! }
!
! function result ( $result, $row=0, $field='' )
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $result = @mysql_result($result, $row, $field);
! return $result;
! }
!
! function fetchArray($query)
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! return @mysql_fetch_array($query);
! }
!
! function fetchAssoc($query)
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! return @mysql_fetch_assoc($query);
! }
!
! function fetchRow($query)
! {
! if ( $this->ident_link == 0 )
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $result = @mysql_fetch_row($query);
! return $result;
! }
!
! function affectedRows() {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! return @mysql_affected_rows($db);
! }
! }
!
?>
--- 1,199 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! class DB
! {
!
! var $ident_link;
! var $connected;
! var $query_count;
!
! function connect ()
! {
! if ( empty ($this->ident_link) )
! {
! $connection = @mysql_connect(DB_HOST, DB_USER, DB_PASSWD);
!
! if ( !$connection )
! {
! $this->connected = 0;
! return 0;
! }
! else
! {
! $this->ident_link = $connection;
!
! return $this->ident_link;
! }
! }
! else
! {
! return $this->ident_link;
! }
!
! }
!
! function close ()
! {
! if ( $this->ident_link != 0 )
! {
! @mysql_close($this->ident_link);
! $this->ident_link = 0;
!
! return 1;
! }
! else
! {
! return 1;
! }
! }
!
! function query ( $qry )
! {
! if ( $this->ident_link == 0 )
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! if ( !$db )
! {
! return 0;
! }
! else
! {
! $result = @mysql_query( $qry, $db );
! $this->query_count++;
! return $result;
! }
! }
!
! function numRows ($query)
! {
! if ( $this->ident_link == 0 )
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $num = @mysql_num_rows($query);
! return $num;
!
! }
!
! function insertID()
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $num = @mysql_insert_id($this->ident_link);
! return $num;
!
! }
!
! function result ( $result, $row=0, $field='' )
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $result = @mysql_result($result, $row, $field);
! return $result;
! }
!
! function fetchArray($query)
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! return @mysql_fetch_array($query);
! }
!
! function fetchAssoc($query)
! {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! return @mysql_fetch_assoc($query);
! }
!
! function fetchRow($query)
! {
! if ( $this->ident_link == 0 )
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! $result = @mysql_fetch_row($query);
! return $result;
! }
!
! function affectedRows() {
! if($this->ident_link == 0)
! {
! $db = $this->connect();
! }
! else
! {
! $db = $this->ident_link;
! }
!
! return @mysql_affected_rows($db);
! }
! }
!
?>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:19:57
|
Update of /cvsroot/phpmp/phpMP/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv26138/admin
Modified Files:
index.php main.php nav.php
Log Message:
Stupid line breaks. Why can't Windows and Mac standardize?
Index: index.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/admin/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** index.php 17 May 2003 07:50:16 -0000 1.7
--- index.php 29 Jun 2003 08:19:55 -0000 1.8
***************
*** 1,47 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! define( C_PHPMP_ROOT, '../' );
!
! include_once( C_PHPMP_ROOT . 'includes/core.php' );
!
! $Core = new Core();
!
! $Core->init();
!
! /******* Commented for Testing *******
! if (U_AUTH_LEVEL != AUTH_LVL_ADMIN)
! {
! exit;
! end;
! }
! **************************************/
!
! // Create the frameset navigation
! print "<frameset cols=\"150,*\">";
! print "<frame name=\"nav\" src=\"nav.php\">";
! print "<frame name=\"cont\" src=\"main.php\">";
! print "</frameset>";
!
! ?>
--- 1,47 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! define( C_PHPMP_ROOT, '../' );
!
! include_once( C_PHPMP_ROOT . 'includes/core.php' );
!
! $Core = new Core();
!
! $Core->init();
!
! /******* Commented for Testing *******
! if (U_AUTH_LEVEL != AUTH_LVL_ADMIN)
! {
! exit;
! end;
! }
! **************************************/
!
! // Create the frameset navigation
! print "<frameset cols=\"150,*\">";
! print "<frame name=\"nav\" src=\"nav.php\">";
! print "<frame name=\"cont\" src=\"main.php\">";
! print "</frameset>";
!
! ?>
Index: main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/admin/main.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** main.php 17 May 2003 07:50:17 -0000 1.6
--- main.php 29 Jun 2003 08:19:55 -0000 1.7
***************
*** 1,63 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! // Action definitions
! define( C_ACTION_NONE, 0 );
! define( C_ACTION_SITE, 1 );
! define( C_ACTION_USER, 2 );
! define( C_PARSE_USER, 3 );
!
! define( C_PHPMP_ROOT, '../' );
!
! include_once( C_PHPMP_ROOT . 'includes/core.php' );
!
! $Core = new Core();
!
! $Core->init();
!
! // Main administration file - just shows site stats, etc...
!
! include_once( C_PHPMP_ROOT . 'includes/admin.php' );
! $admin = new Admin();
!
! switch ($parse)
! {
! case C_ACTION_SITE:
! if (!$submit_general) { return; }
! $admin->parse_site($sname, $ovrtpl, $deftpl, $deflang, $defdate, $accact, $systime, $portperms);
! break;
! case C_ACTION_USER:
! if (!$submit_user) { return; }
! $admin->show_user($userid);
! break;
! case C_PARSE_USER:
! if (!$submit_user_parse) { return; }
! $admin->parse_user($userid, $username, $passwd, $email, $auth_level, $date_format, $template, $signature, $delete);
! break;
! default: // $parse is not supplied, so execute $action instead
! if ($action != C_ACTION_NONE) { $admin->execute($action); }
! break;
! }
!
! ?>
--- 1,63 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! // Action definitions
! define( C_ACTION_NONE, 0 );
! define( C_ACTION_SITE, 1 );
! define( C_ACTION_USER, 2 );
! define( C_PARSE_USER, 3 );
!
! define( C_PHPMP_ROOT, '../' );
!
! include_once( C_PHPMP_ROOT . 'includes/core.php' );
!
! $Core = new Core();
!
! $Core->init();
!
! // Main administration file - just shows site stats, etc...
!
! include_once( C_PHPMP_ROOT . 'includes/admin.php' );
! $admin = new Admin();
!
! switch ($parse)
! {
! case C_ACTION_SITE:
! if (!$submit_general) { return; }
! $admin->parse_site($sname, $ovrtpl, $deftpl, $deflang, $defdate, $accact, $systime, $portperms);
! break;
! case C_ACTION_USER:
! if (!$submit_user) { return; }
! $admin->show_user($userid);
! break;
! case C_PARSE_USER:
! if (!$submit_user_parse) { return; }
! $admin->parse_user($userid, $username, $passwd, $email, $auth_level, $date_format, $template, $signature, $delete);
! break;
! default: // $parse is not supplied, so execute $action instead
! if ($action != C_ACTION_NONE) { $admin->execute($action); }
! break;
! }
!
! ?>
Index: nav.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/admin/nav.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** nav.php 17 May 2003 07:50:17 -0000 1.5
--- nav.php 29 Jun 2003 08:19:55 -0000 1.6
***************
*** 1,47 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! // Basic Navigation (not very pretty, just a throw-together for testing
!
! define( C_PHPMP_ROOT, '../' );
!
! include_once( C_PHPMP_ROOT . 'includes/core.php' );
!
! $Core = new Core();
!
! $Core->init();
!
! /******* Comented for Testing *******
! if (U_AUTH_LEVEL != AUTH_LVL_ADMIN)
! {
! exit;
! end;
! }
! *************************************/
!
! print "<base target=\"cont\">\n";
! print "<a href=\"main.php?action=1\">Site Configuration</a><br>";
! print "<a href=\"main.php?action=2\">User Management</a>";
!
! ?>
--- 1,47 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! // Basic Navigation (not very pretty, just a throw-together for testing
!
! define( C_PHPMP_ROOT, '../' );
!
! include_once( C_PHPMP_ROOT . 'includes/core.php' );
!
! $Core = new Core();
!
! $Core->init();
!
! /******* Comented for Testing *******
! if (U_AUTH_LEVEL != AUTH_LVL_ADMIN)
! {
! exit;
! end;
! }
! *************************************/
!
! print "<base target=\"cont\">\n";
! print "<a href=\"main.php?action=1\">Site Configuration</a><br>";
! print "<a href=\"main.php?action=2\">User Management</a>";
!
! ?>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 08:19:57
|
Update of /cvsroot/phpmp/phpMP
In directory sc8-pr-cvs1:/tmp/cvs-serv26138
Modified Files:
config.php index.php modules.php
Log Message:
Stupid line breaks. Why can't Windows and Mac standardize?
Index: config.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/config.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** config.php 29 Jun 2003 05:53:24 -0000 1.4
--- config.php 29 Jun 2003 08:19:54 -0000 1.5
***************
*** 1,18 ****
- <?php
-
- ## DO NOT ALTER THIS FILE.
- ## This file is automatically generated
- ## by the phpMP install script. Do not
- ## alter this file if you don't know
- ## what you're doing.
-
- define( "PHPMP_INSTALLED", TRUE );
-
- define( "DB_TYPE", "mysql" );
- define( "DB_HOST", "localhost" );
- define( "DB_NAME", "phpmp" );
- define( "DB_TABLE_PREFIX", "phpmp_" );
- define( "DB_USER", "root" );
- define( "DB_PASSWD", "fl1ntflar3" );
-
- ?>
\ No newline at end of file
--- 0 ----
Index: index.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/index.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** index.php 29 Jun 2003 05:53:24 -0000 1.45
--- index.php 29 Jun 2003 08:19:54 -0000 1.46
***************
*** 1,54 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! define("PHPMP_ROOT", "./");
! include_once( PHPMP_ROOT . 'includes/core.php' );
! $Core = new Core();
!
! global $Template;
!
! $Template->assign_vars( array(
! 'C_SITE_NAME' => $Config->get('site_name'),
! 'C_SITE_ADDRESS' => $Config->get('site_domain') . $Config->get('rel_path'),
! 'C_VERSION' => $Config->get('version'),
! 'C_REL_PATH' => $Config->get('rel_path'),
! 'C_TEMPLATE' => $Config->get('template'),
! 'U_USERNAME' => $User->get('user_name')
! ) );
!
! $Template->set_filenames( array(
! 'header' => 'header.html',
! 'left_column' => 'left_column.html',
! 'body' => 'index.html',
! 'right_column' => 'right_column.html',
! 'footer' => 'footer.html'
! ) );
!
! $Template->display('header');
! $Template->display('left_column');
! $Template->display('body');
! $Template->display('right_column');
! $Template->display('footer');
!
?>
--- 1,54 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! define("PHPMP_ROOT", "./");
! include_once( PHPMP_ROOT . 'includes/core.php' );
! $Core = new Core();
!
! global $Template;
!
! $Template->assign_vars( array(
! 'C_SITE_NAME' => $Config->get('site_name'),
! 'C_SITE_ADDRESS' => $Config->get('site_domain') . $Config->get('rel_path'),
! 'C_VERSION' => $Config->get('version'),
! 'C_REL_PATH' => $Config->get('rel_path'),
! 'C_TEMPLATE' => $Config->get('template'),
! 'U_USERNAME' => $User->get('user_name')
! ) );
!
! $Template->set_filenames( array(
! 'header' => 'header.html',
! 'left_column' => 'left_column.html',
! 'body' => 'index.html',
! 'right_column' => 'right_column.html',
! 'footer' => 'footer.html'
! ) );
!
! $Template->display('header');
! $Template->display('left_column');
! $Template->display('body');
! $Template->display('right_column');
! $Template->display('footer');
!
?>
Index: modules.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/modules.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** modules.php 19 May 2003 23:39:59 -0000 1.17
--- modules.php 29 Jun 2003 08:19:54 -0000 1.18
***************
*** 1,72 ****
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! // Module handler.
! class Module
! {
!
! // The following two functions manage module variables, allowing the
! // module author to easily maintain variable data from point to point.
! // All modules, in order to meet compliance, should fully utilize these
! // functions.
! function setVar($varkey, $varval = false)
! {
! if(is_array( $varkey ))
! {
! foreach( $userkey as $key => $val )
! {
! if( preg_match('/[^a-z][a-z0-9_-]/', $key) )
! {
! $this->_keydata[$key] = $val;
! }
! }
! }
! elseif( (!empty($varkey)) && (preg_match('/[^a-z][a-z0-9_-]/', $varkey)) && (!empty($varval)) )
! {
! $this->_data[$userkey] = $userval;
! return true;
! }
! else
! {
! return false;
! }
! }
!
! function getVar($varkey)
! {
! if( !empty($this->_data[$varkey]) )
! {
! return $this->_data[$varkey];
! }
! else
! {
! return false;
! }
! }
!
! function loadHook( $hookname, $hookjob )
! {
! }
! }
?>
--- 1,72 ----
! <?php
!
! /*
! * phpMP - The PHP Modular Portal System
! * Copyright (C) 2002-2003 Brian Rose and the phpMP group
! *
! * 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.
! *
! * $Id$
! *
! */
!
! // Module handler.
! class Module
! {
!
! // The following two functions manage module variables, allowing the
! // module author to easily maintain variable data from point to point.
! // All modules, in order to meet compliance, should fully utilize these
! // functions.
! function setVar($varkey, $varval = false)
! {
! if(is_array( $varkey ))
! {
! foreach( $userkey as $key => $val )
! {
! if( preg_match('/[^a-z][a-z0-9_-]/', $key) )
! {
! $this->_keydata[$key] = $val;
! }
! }
! }
! elseif( (!empty($varkey)) && (preg_match('/[^a-z][a-z0-9_-]/', $varkey)) && (!empty($varval)) )
! {
! $this->_data[$userkey] = $userval;
! return true;
! }
! else
! {
! return false;
! }
! }
!
! function getVar($varkey)
! {
! if( !empty($this->_data[$varkey]) )
! {
! return $this->_data[$varkey];
! }
! else
! {
! return false;
! }
! }
!
! function loadHook( $hookname, $hookjob )
! {
! }
! }
?>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 06:09:43
|
Update of /cvsroot/phpmp/phpMP/templates/BlueMP
In directory sc8-pr-cvs1:/tmp/cvs-serv14401/templates/BlueMP
Modified Files:
header.html
Log Message:
Fixing double-slashing.
Index: header.html
===================================================================
RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/header.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** header.html 29 Jun 2003 05:53:24 -0000 1.2
--- header.html 29 Jun 2003 06:09:40 -0000 1.3
***************
*** 7,11 ****
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
! <link rel="stylesheet" type="text/css" media="screen" href="{C_REL_PATH}/templates/{C_TEMPLATE}/css/base.css" />
</head>
--- 7,11 ----
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
! <link rel="stylesheet" type="text/css" media="screen" href="{C_REL_PATH}templates/{C_TEMPLATE}/css/base.css" />
</head>
***************
*** 13,16 ****
<div id="container">
! <div id="logo"><a href="{C_REL_PATH}/index.php"><img src="{C_REL_PATH}/templates/{C_TEMPLATE}/images/phpMp_logo.png" width="252" height="78" alt="" /></a></div>
<div id="logininfo"><a href="login">{L_LOGIN}</a> - <a href="register">{L_REGISTER}</a></div>
--- 13,16 ----
<div id="container">
! <div id="logo"><a href="{C_REL_PATH}/index.php"><img src="{C_REL_PATH}templates/{C_TEMPLATE}/images/phpMP_logo.png" width="252" height="78" alt="" /></a></div>
<div id="logininfo"><a href="login">{L_LOGIN}</a> - <a href="register">{L_REGISTER}</a></div>
|
|
From: Brian R. <hei...@us...> - 2003-06-29 05:53:27
|
Update of /cvsroot/phpmp/phpMP/templates/BlueMP In directory sc8-pr-cvs1:/tmp/cvs-serv13269/templates/BlueMP Modified Files: footer.html header.html index.html left_column.html right_column.html Log Message: Hopefully this will fix a few problems. Index: footer.html =================================================================== RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/footer.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** footer.html 2 Jun 2003 22:32:32 -0000 1.1 --- footer.html 29 Jun 2003 05:53:24 -0000 1.2 *************** *** 0 **** --- 1,3 ---- + </div> + </body> + </html> \ No newline at end of file Index: header.html =================================================================== RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/header.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** header.html 2 Jun 2003 22:32:33 -0000 1.1 --- header.html 29 Jun 2003 05:53:24 -0000 1.2 *************** *** 0 **** --- 1,16 ---- + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" dir="ltr"> + <head> + + <title>{C_SITE_NAME} :: {L_INDEX}</title> + + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + + <link rel="stylesheet" type="text/css" media="screen" href="{C_REL_PATH}/templates/{C_TEMPLATE}/css/base.css" /> + + </head> + <body> + + <div id="container"> + <div id="logo"><a href="{C_REL_PATH}/index.php"><img src="{C_REL_PATH}/templates/{C_TEMPLATE}/images/phpMp_logo.png" width="252" height="78" alt="" /></a></div> + <div id="logininfo"><a href="login">{L_LOGIN}</a> - <a href="register">{L_REGISTER}</a></div> \ No newline at end of file Index: index.html =================================================================== RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** index.html 2 Jun 2003 22:32:33 -0000 1.2 --- index.html 29 Jun 2003 05:53:24 -0000 1.3 *************** *** 1,15 **** ! <html> ! <body> ! phpMP Version: {C_Version}<br><br> ! ! Site Name: {C_Site_Name}<br> ! Site Address: {C_Site_Address}<br> ! Relative Path: {C_Rel_Path}<br> ! Default Template: {U_Template_Name}<br> ! Default Language: {U_Language}<br> ! The Current Date and Time: {U_Current_Time}<br> ! Current Logged User: {U_Username}<br><br> ! ! </body> ! </html> \ No newline at end of file --- 1,27 ---- ! <div id="contentboxes"> ! <div class="boxheader">» {L_WELCOME_TO} {C_SITE_NAME}</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">Articles</div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div id="footer"> ! Copyright © 2003 ! </div> ! </div> \ No newline at end of file Index: left_column.html =================================================================== RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/left_column.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** left_column.html 2 Jun 2003 22:32:33 -0000 1.1 --- left_column.html 29 Jun 2003 05:53:24 -0000 1.2 *************** *** 0 **** --- 1,29 ---- + <div id="leftboxes"> + <div class="boxheader">{L_MAIN_MENU}</div> + <div class="boxcontent"> + <ul> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + </ul> + </div> + <div class="boxheader">Left Box 1</div> + <div class="boxcontent"> + <ul> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + </ul> + </div> + <div class="boxheader">{L_USER_SETTINGS}</div> + <div class="boxcontent"> + <form action="login" method="post"> + <div>{L_USERNAME}: <input type="text" name="username" value="" style="width: 100px;" /></div> + <div>{L_PASSWORD}: <input type="password" name="password" value="" style="width: 100px;" /></div> + <div><input type="submit" name="login" value="Logon!" /></div> + </form> + </div> + </div> \ No newline at end of file Index: right_column.html =================================================================== RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/right_column.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** right_column.html 2 Jun 2003 22:32:33 -0000 1.1 --- right_column.html 29 Jun 2003 05:53:24 -0000 1.2 *************** *** 0 **** --- 1,30 ---- + <div id="rightboxes"> + <div class="boxheader">{L_MAIN_MENU}</div> + <div class="boxcontent"> + <ul> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + </ul> + </div> + <div class="boxheader">Left Box 1</div> + <div class="boxcontent"> + <ul> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + </ul> + </div> + <div class="boxheader">Left Box 1</div> + <div class="boxcontent"> + <ul> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + <li><a href="index">Link</a></li> + </ul> + </div> + </div> \ No newline at end of file |
|
From: Brian R. <hei...@us...> - 2003-06-29 05:53:27
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv13269/includes
Modified Files:
config.init.php core.php debug.php language.php mpcode.php
session.php template.php user.php
Log Message:
Hopefully this will fix a few problems.
Index: config.init.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/config.init.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** core.php 3 Jun 2003 06:48:21 -0000 1.57
--- core.php 29 Jun 2003 05:53:24 -0000 1.58
***************
*** 67,72 ****
}
! //error_reporting(E_ERROR | E_WARNING | E_PARSE);
! error_reporting(E_ALL);
include_once( PHPMP_ROOT . 'config.php' );
--- 67,72 ----
}
! //error_reporting(E_ALL);
! error_reporting(E_ERROR | E_WARNING | E_PARSE);
include_once( PHPMP_ROOT . 'config.php' );
***************
*** 136,141 ****
}
! $Template->set_template( $Config->get('template') );
! echo $Config->get('template');
$DB->close();
}
--- 136,140 ----
}
! $Template->set_template( $Config->get('template'), false, true );
$DB->close();
}
Index: debug.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/debug.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
Index: language.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/language.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
Index: mpcode.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/mpcode.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
Index: session.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/session.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** template.php 3 Jun 2003 06:48:21 -0000 1.36
--- template.php 29 Jun 2003 05:53:24 -0000 1.37
***************
*** 7,11 ****
* 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.
*
--- 7,11 ----
* 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 vlersion 2 of the License, or
* (at your option) any later version.
*
***************
*** 53,64 ****
var $block_nesting_level = 0;
var $force_recompile;
!
! function set_template($template = '', $force_recompile = false)
{
$this->root = PHPMP_ROOT . 'templates/' . $template;
! $this->cachedir = PHPMP_ROOT . $this->cache_root . $template . '/';
$this->force_recompile = $force_recompile;
--- 53,67 ----
var $block_nesting_level = 0;
+ var $static_lang;
var $force_recompile;
!
!
! function set_template($template = '', $static_lang = false, $force_recompile = false)
{
$this->root = PHPMP_ROOT . 'templates/' . $template;
! $this->cachedir = PHPMP_ROOT . $this->cache_root . $template . '/';
+ $this->static_lang = $static_lang;
$this->force_recompile = $force_recompile;
***************
*** 115,118 ****
--- 118,122 ----
function display($handle)
{
+ global $Config, $Local;
if ($filename = $this->_tpl_load($handle))
***************
*** 131,137 ****
function _tpl_load(&$handle)
{
! global $Config;
! $filename = $this->cachedir . $this->filename[$handle] . '.' . $Config->get('language') . '.php';
// Recompile page if the original template is newer, otherwise load the compiled version
--- 135,141 ----
function _tpl_load(&$handle)
{
! global $Config, $user;
! $filename = $this->cachedir . $this->filename[$handle] . '.' . (($this->static_lang) ? $Config->get('language') . '.' : '') . 'php';
// Recompile page if the original template is newer, otherwise load the compiled version
***************
*** 150,154 ****
if (!isset($this->files[$handle]))
{
! trigger_error("Template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
}
--- 154,158 ----
if (!isset($this->files[$handle]))
{
! trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
}
***************
*** 157,161 ****
if (!($fp = @fopen($this->files[$handle], 'r')))
{
! trigger_error("Template->_tpl_load(): File $filename does not exist or is empty", E_USER_ERROR);
}
--- 161,165 ----
if (!($fp = @fopen($this->files[$handle], 'r')))
{
! trigger_error("template->_tpl_load(): File $filename does not exist or is empty", E_USER_ERROR);
}
***************
*** 226,230 ****
function _tpl_include($filename, $include = true)
{
! global $user;
$handle = $filename;
--- 230,234 ----
function _tpl_include($filename, $include = true)
{
! global $user, $Config, $Local;
$handle = $filename;
***************
*** 253,256 ****
--- 257,261 ----
{
global $Config;
+ error_reporting(E_ERROR | E_WARNING | E_PARSE);
// Remove any "loose" php ... we want to give admins the ability
***************
*** 348,352 ****
$this->compile_var_tags($blocks[0][$curr_tb]);
$trim_check = trim($blocks[0][$curr_tb]);
! $compile_blocks[] = (!$do_not_echo) ? ((!empty($trim_check)) ? $blocks[0][$curr_tb] : '') : ((!empty($trim_check)) ? $blocks[0][$curr_tb] : '');
break;
}
--- 353,357 ----
$this->compile_var_tags($blocks[0][$curr_tb]);
$trim_check = trim($blocks[0][$curr_tb]);
! $compile_blocks[] = (!$no_echo) ? ((!empty($trim_check)) ? $blocks[0][$curr_tb] : '') : ((!empty($trim_check)) ? $blocks[0][$curr_tb] : '');
break;
}
***************
*** 386,398 ****
}
- global $Local;
-
// This will handle the remaining root-level varrefs
if (!$this->static_lang)
{
$text_blocks = preg_replace('#\{L_([a-z0-9\-_]*?)\}#is', "<?php echo ((isset(\$this->_tpldata['.'][0]['L_\\1'])) ? \$this->_tpldata['.'][0]['L_\\1'] : ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '{ ' . ucfirst(strtolower(str_replace('_', ' ', '\\1'))) . ' }')); ?>", $text_blocks);
}
else
{
$text_blocks = preg_replace('#\{L_([A-Z0-9\-_]*?)\}#e', "'<?php echo ((isset(\$this->_tpldata[\'.\'][0][\'L_\\1\'])) ? \$this->_tpldata[\'.\'][0][\'L_\\1\'] : \'' . ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '') . '\'); ?>'" , $text_blocks);
}
--- 391,404 ----
}
// This will handle the remaining root-level varrefs
if (!$this->static_lang)
{
+ global $Local;
$text_blocks = preg_replace('#\{L_([a-z0-9\-_]*?)\}#is', "<?php echo ((isset(\$this->_tpldata['.'][0]['L_\\1'])) ? \$this->_tpldata['.'][0]['L_\\1'] : ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '{ ' . ucfirst(strtolower(str_replace('_', ' ', '\\1'))) . ' }')); ?>", $text_blocks);
}
else
{
+ global $Local;
+
$text_blocks = preg_replace('#\{L_([A-Z0-9\-_]*?)\}#e', "'<?php echo ((isset(\$this->_tpldata[\'.\'][0][\'L_\\1\'])) ? \$this->_tpldata[\'.\'][0][\'L_\\1\'] : \'' . ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '') . '\'); ?>'" , $text_blocks);
}
***************
*** 688,694 ****
function compile_write(&$handle, $data)
{
! global $Config;
! $filename = $this->cachedir . $this->filename[$handle] . '.' . $Config->get('language') . '.php';
if ($fp = @fopen($filename, 'w+'))
--- 694,700 ----
function compile_write(&$handle, $data)
{
! global $user, $Config;
! $filename = $this->cachedir . $this->filename[$handle] . '.' . (($this->static_lang) ? $Config->get('language') . '.' : '') . 'php';
if ($fp = @fopen($filename, 'w+'))
Index: user.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/user.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
|
|
From: Brian R. <hei...@us...> - 2003-06-29 05:53:27
|
Update of /cvsroot/phpmp/phpMP/languages/english
In directory sc8-pr-cvs1:/tmp/cvs-serv13269/languages/english
Modified Files:
lang_main.php
Log Message:
Hopefully this will fix a few problems.
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/languages/english/lang_main.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** lang_main.php 3 Jun 2003 06:48:22 -0000 1.21
--- lang_main.php 29 Jun 2003 05:53:24 -0000 1.22
***************
*** 39,60 ****
// Note: Always escape single quote characters (') with a backslash (\).
//
! 'L_Welcome_to_Site' => 'Welcome to ' . $Config->get('site_name') . '!',
! 'L_Home' => 'Home',
! 'L_Profile' => 'Profile',
! 'L_Modules' => 'Modules',
! 'L_Downloads' => 'Downloads',
! 'L_Username' => 'Username',
! 'L_User_CP' => 'User CP',
! 'L_User_Control_Panel' => 'User Control Panel',
! 'L_E-mail' => 'E-mail',
! 'L_Password' => 'Password',
! 'L_Confirm' => 'Confirm',
! 'L_Real Name' => 'Real Name',
! 'L_Location' => 'Location',
! 'L_Register' => 'Register',
! 'L_Welcome' => 'Welcome',
! 'L_Administration_Area' => 'Administration Area',
! 'L_Register_a_Username' => 'Register a Username',
--- 39,59 ----
// Note: Always escape single quote characters (') with a backslash (\).
//
! 'WELCOME_TO' => 'Welcome to ',
! 'HOME' => 'Home',
! 'PROFILE' => 'Profile',
! 'MODULES' => 'Modules',
! 'DOWNLOADS' => 'Downloads',
! 'USERNAME' => 'Username',
! 'USER_CP' => 'User CP',
! 'USER_CONTROL_PANEL' => 'User Control Panel',
! 'E_MAIL' => 'E-mail',
! 'PASSWORD' => 'Password',
! 'CONFIRM' => 'Confirm',
! 'REAL_NAME' => 'Real Name',
! 'LOCATION' => 'Location',
! 'REGISTER' => 'Register',
! 'ADMINISTRATION AREA' => 'Administration Area',
! 'REGISTER_A_USERNAME' => 'Register a Username',
***************
*** 62,73 ****
// Below is language used almost specifically for auth.
//
! 'L_Login' => 'Login',
! 'L_Logout' => 'Logout',
! 'L_Account_Activated' => 'Your account has been activated. You may now log in.',
! 'L_Required_Field' => 'Denotes a Required Field',
! 'L_Register_Finished' => 'Your registration has been processed. Please check your e-mail for a message explaining how to activate your new account.',
! 'L_Forgot_Password' => 'Forgot Your Password?',
! 'L_Not_logged_in' => 'You are not logged in.',
--- 61,72 ----
// Below is language used almost specifically for auth.
//
! 'LOGIN' => 'Login',
! 'LOGOUT' => 'Logout',
! 'ACCOUNT_ACTIVATED' => 'Your account has been activated. You may now log in.',
! 'REQUIRED_FIELD' => 'Denotes a Required Field',
! 'REGISTER_FINISHED' => 'Your registration has been processed. Please check your e-mail for a message explaining how to activate your new account.',
! 'FORGOT_PASSWORD' => 'Forgot Your Password?',
! 'NOT_LOGGED_IN' => 'You are not logged in.',
***************
*** 75,80 ****
// Other various parts of the templates.
//
! 'L_Powered_by_phpMP' => 'powered by phpMP ' . $Config->get('version') . ' © 2002 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
! 'L_Copyright' => 'All content is property of its respective owner. All rights reserved.'
// It is IMPERATIVE that the last array value entered (usually the copyright)
--- 74,79 ----
// Other various parts of the templates.
//
! 'POWERED_BY' => 'powered by phpMP ' . $Config->get('version') . ' © 2002 <a href="http://phpmp.sourceforge.net/">phpMP Dev. Group</a>.',
! 'COPYRIGHT' => 'All content is property of its respective owner. All rights reserved.'
// It is IMPERATIVE that the last array value entered (usually the copyright)
|
|
From: Brian R. <hei...@us...> - 2003-06-29 05:53:27
|
Update of /cvsroot/phpmp/phpMP
In directory sc8-pr-cvs1:/tmp/cvs-serv13269
Modified Files:
config.php index.php
Log Message:
Hopefully this will fix a few problems.
Index: config.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/config.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** config.php 2 May 2003 04:52:56 -0000 1.3
--- config.php 29 Jun 2003 05:53:24 -0000 1.4
***************
*** 0 ****
--- 1,18 ----
+ <?php
+
+ ## DO NOT ALTER THIS FILE.
+ ## This file is automatically generated
+ ## by the phpMP install script. Do not
+ ## alter this file if you don't know
+ ## what you're doing.
+
+ define( "PHPMP_INSTALLED", TRUE );
+
+ define( "DB_TYPE", "mysql" );
+ define( "DB_HOST", "localhost" );
+ define( "DB_NAME", "phpmp" );
+ define( "DB_TABLE_PREFIX", "phpmp_" );
+ define( "DB_USER", "root" );
+ define( "DB_PASSWD", "fl1ntflar3" );
+
+ ?>
\ No newline at end of file
Index: index.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/index.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** index.php 3 Jun 2003 06:48:20 -0000 1.44
--- index.php 29 Jun 2003 05:53:24 -0000 1.45
***************
*** 30,42 ****
$Template->assign_vars( array(
! 'C_Site_Name' => $Config->get('site_name'),
! 'C_Site_Address' => $Config->get('site_domain') . $Config->get('rel_path'),
! 'C_Version' => $Config->get('version'),
! 'C_Rel_Path' => $Config->get('rel_path'),
! 'C_Site_Name' => $Config->get('site_name'),
! 'U_Template_Name' => $User->get('user_tpl'),
! 'U_Language' => $User->get('language'),
! 'U_Current_Time' => time(),
! 'U_Username' => $User->get('user_name')
) );
--- 30,39 ----
$Template->assign_vars( array(
! 'C_SITE_NAME' => $Config->get('site_name'),
! 'C_SITE_ADDRESS' => $Config->get('site_domain') . $Config->get('rel_path'),
! 'C_VERSION' => $Config->get('version'),
! 'C_REL_PATH' => $Config->get('rel_path'),
! 'C_TEMPLATE' => $Config->get('template'),
! 'U_USERNAME' => $User->get('user_name')
) );
|
|
From: Brian R. <hei...@us...> - 2003-06-03 07:14:50
|
Update of /cvsroot/phpmp/phpMP
In directory sc8-pr-cvs1:/tmp/cvs-serv19972
Modified Files:
index.php
Log Message:
Template system fixed and working (to the best of my knowledge).
Index: index.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/index.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** index.php 2 Jun 2003 22:32:30 -0000 1.43
--- index.php 3 Jun 2003 06:48:20 -0000 1.44
***************
*** 31,42 ****
$Template->assign_vars( array(
'C_Site_Name' => $Config->get('site_name'),
! 'C_Site_Address' => $Config->get('site_addr'),
'C_Version' => $Config->get('version'),
'C_Rel_Path' => $Config->get('rel_path'),
'C_Site_Name' => $Config->get('site_name'),
! 'U_Template_Name' => $User->get('template'),
'U_Language' => $User->get('language'),
'U_Current_Time' => time(),
! 'U_Username' => $User->get('username')
) );
--- 31,42 ----
$Template->assign_vars( array(
'C_Site_Name' => $Config->get('site_name'),
! 'C_Site_Address' => $Config->get('site_domain') . $Config->get('rel_path'),
'C_Version' => $Config->get('version'),
'C_Rel_Path' => $Config->get('rel_path'),
'C_Site_Name' => $Config->get('site_name'),
! 'U_Template_Name' => $User->get('user_tpl'),
'U_Language' => $User->get('language'),
'U_Current_Time' => time(),
! 'U_Username' => $User->get('user_name')
) );
|
|
From: Brian R. <hei...@us...> - 2003-06-03 06:51:43
|
Update of /cvsroot/phpmp/phpMP/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv19972/includes
Modified Files:
config.init.php core.php debug.php language.php mpcode.php
session.php template.php user.php
Log Message:
Template system fixed and working (to the best of my knowledge).
Index: config.init.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/config.init.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** config.init.php 19 May 2003 23:39:59 -0000 1.4
--- config.init.php 3 Jun 2003 06:48:21 -0000 1.5
***************
*** 41,47 ****
}
function set($cfgkey, $cfgval)
{
! if( (!empty($cfgkey)) && (preg_match('/[^a-z][a-z0-9_-]/', $cfgkey)) && (!empty($cfgval)) )
{
$this->_cfgvars[$cfgkey] = $cfgval;
--- 41,53 ----
}
+ /**
+ * @return unknown
+ * @param cfgkey unknown
+ * @param cfgval unknown
+ * @desc Inserts the value of a given key into the Config array.
+ */
function set($cfgkey, $cfgval)
{
! if( (!empty($cfgkey)) && (preg_match('/^[a-z][a-z0-9_-]+/', $cfgkey)) && (!empty($cfgval)) )
{
$this->_cfgvars[$cfgkey] = $cfgval;
***************
*** 54,57 ****
--- 60,68 ----
}
+ /**
+ * @return unknown
+ * @param cfgkey unknown
+ * @desc Fetches config array values.
+ */
function get($cfgkey)
{
Index: core.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/core.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** core.php 2 Jun 2003 22:32:31 -0000 1.56
--- core.php 3 Jun 2003 06:48:21 -0000 1.57
***************
*** 67,72 ****
}
! error_reporting(E_ERROR | E_WARNING | E_PARSE);
! //error_reporting(E_ALL);
include_once( PHPMP_ROOT . 'config.php' );
--- 67,72 ----
}
! //error_reporting(E_ERROR | E_WARNING | E_PARSE);
! error_reporting(E_ALL);
include_once( PHPMP_ROOT . 'config.php' );
***************
*** 78,83 ****
$Debug = new Debug();
- set_error_handler(array('Debug', 'msgDisplay'));
-
include_once( PHPMP_ROOT . 'dba/' . DB_TYPE . '.dba' );
$DB = new DB();
--- 78,81 ----
***************
*** 125,135 ****
}
}
!
include_once(PHPMP_ROOT . 'includes/template.php');
$Template = new Template();
- $Template->set_template('BlueMP');
$DB->close();
! }
}
--- 123,143 ----
}
}
!
include_once(PHPMP_ROOT . 'includes/template.php');
$Template = new Template();
+ if( $User->get('template') == false )
+ {
+ $Config->set('template', $Config->get('default_tpl'));
+ }
+ else
+ {
+ $Config->set('template', $User->get('template'));
+ }
+
+ $Template->set_template( $Config->get('template') );
+ echo $Config->get('template');
$DB->close();
! }
}
Index: debug.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/debug.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** debug.php 17 May 2003 07:50:17 -0000 1.5
--- debug.php 3 Jun 2003 06:48:21 -0000 1.6
***************
*** 28,32 ****
function Debug()
{
!
}
--- 28,32 ----
function Debug()
{
! @set_error_handler( array(&$this, 'msgDisplay') );
}
***************
*** 50,54 ****
{
$DB->close();
! echo "A User Error has occurred. Please notify the <a href=\"mailto: " . $Config['site_contact'] . "\">board administrator</a>.";
}
break;
--- 50,54 ----
{
$DB->close();
! echo $msg_text;
}
break;
Index: language.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/language.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** language.php 17 May 2003 07:50:17 -0000 1.12
--- language.php 3 Jun 2003 06:48:21 -0000 1.13
***************
*** 22,26 ****
*
*/
!
class Language
{
--- 22,26 ----
*
*/
!
class Language
{
***************
*** 29,35 ****
{
global $Config, $User, $Local;
- ($User->get('language') != '') ? ($Config->set('language', $User->get('language'))) : ($Config->set('language', $Config->get('default_lang')));
! include_once( PHPMP_ROOT . 'languages/' . $Config->get('language') . '/lang_main.php' );
$Local = new Localization();
--- 29,49 ----
{
global $Config, $User, $Local;
! $cfg_lang = $Config->get('default_lang');
! $usr_lang = $User->get('language');
! $lang = '';
!
! (empty($usr_lang)) ? $lang = $cfg_lang : $lang = $usr_lang;
!
! $Config->set('language', $lang);
! $lang_file = PHPMP_ROOT . 'languages/' . $lang . '/lang_main.php';
!
! if (!file_exists($lang_file))
! {
! trigger_error("localization error - \"$lang_file\" does not exist.", E_USER_ERROR);
! }
!
! include_once( $lang_file );
!
$Local = new Localization();
Index: mpcode.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/mpcode.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** mpcode.php 17 May 2003 07:50:17 -0000 1.6
--- mpcode.php 3 Jun 2003 06:48:21 -0000 1.7
***************
*** 47,51 ****
// This may not be the best way, but it works
function _replace($string) {
! include ("phpmp/includes/mpcode_arrays.php");
foreach ($mpcode as $key => $code) {
--- 47,51 ----
// This may not be the best way, but it works
function _replace($string) {
! include (PHPMP_ROOT . "includes/mpcode_arrays.php");
foreach ($mpcode as $key => $code) {
Index: session.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/session.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** session.php 17 May 2003 07:50:17 -0000 1.11
--- session.php 3 Jun 2003 06:48:21 -0000 1.12
***************
*** 133,137 ****
// Capture the page we're at.
! $this->page = basename($_SERVER['REQUEST_URI']);
$cur_time = time(); // Time as of right now.
--- 133,137 ----
// Capture the page we're at.
! //$this->page = basename($_SERVER['REQUEST_URI']);
$cur_time = time(); // Time as of right now.
Index: template.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/template.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** template.php 2 Jun 2003 22:32:32 -0000 1.35
--- template.php 3 Jun 2003 06:48:21 -0000 1.36
***************
*** 22,28 ****
*
*/
-
- // Contains the Template class.
- // This will utilize a flat-file template system.
/*
--- 22,25 ----
***************
*** 57,62 ****
var $force_recompile;
!
!
function set_template($template = '', $force_recompile = false)
{
--- 54,58 ----
var $force_recompile;
!
function set_template($template = '', $force_recompile = false)
{
***************
*** 390,398 ****
}
// This will handle the remaining root-level varrefs
else
{
- global $Local;
-
$text_blocks = preg_replace('#\{L_([A-Z0-9\-_]*?)\}#e', "'<?php echo ((isset(\$this->_tpldata[\'.\'][0][\'L_\\1\'])) ? \$this->_tpldata[\'.\'][0][\'L_\\1\'] : \'' . ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '') . '\'); ?>'" , $text_blocks);
}
--- 386,398 ----
}
+ global $Local;
+
// This will handle the remaining root-level varrefs
+ if (!$this->static_lang)
+ {
+ $text_blocks = preg_replace('#\{L_([a-z0-9\-_]*?)\}#is', "<?php echo ((isset(\$this->_tpldata['.'][0]['L_\\1'])) ? \$this->_tpldata['.'][0]['L_\\1'] : ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '{ ' . ucfirst(strtolower(str_replace('_', ' ', '\\1'))) . ' }')); ?>", $text_blocks);
+ }
else
{
$text_blocks = preg_replace('#\{L_([A-Z0-9\-_]*?)\}#e', "'<?php echo ((isset(\$this->_tpldata[\'.\'][0][\'L_\\1\'])) ? \$this->_tpldata[\'.\'][0][\'L_\\1\'] : \'' . ((isset(\$Local->lang['\\1'])) ? \$Local->lang['\\1'] : '') . '\'); ?>'" , $text_blocks);
}
Index: user.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/includes/user.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** user.php 19 May 2003 23:39:59 -0000 1.22
--- user.php 3 Jun 2003 06:48:22 -0000 1.23
***************
*** 34,38 ****
foreach( $userkey as $key => $val )
{
! if(preg_match('/[^a-z][a-z0-9_-]/', $key))
{
$this->_data[$key] = $val;
--- 34,38 ----
foreach( $userkey as $key => $val )
{
! if(preg_match('/^[a-z][a-z0-9_-]+/', $key))
{
$this->_data[$key] = $val;
***************
*** 40,44 ****
}
}
! elseif( (!empty($userkey)) && (preg_match('/[^a-z][a-z0-9_-]/', $userkey)) && (!empty($userval)) )
{
$this->_data[$userkey] = $userval;
--- 40,44 ----
}
}
! elseif( (!empty($userkey)) && (preg_match('/^[a-z][a-z0-9_-]+/', $userkey)) && (!empty($userval)) )
{
$this->_data[$userkey] = $userval;
***************
*** 51,54 ****
--- 51,59 ----
}
+ /**
+ * @return unknown
+ * @param userkey unknown
+ * @desc Fetches user variables from the defined array.
+ */
function get($userkey)
{
***************
*** 66,86 ****
function getIPEncoded()
{
! if( getenv('HTTP_X_FORWARDED_FOR') != '' )
{
! $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
!
! if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) )
{
! $private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.16\..*/', '/^10.\.*/', '/^224.\.*/', '/^240.\.*/');
! $client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
}
}
- else
- {
- $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
- }
-
- $ip_sep = explode('.', $client_ip);
- return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]);
}
--- 71,84 ----
function getIPEncoded()
{
! $this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? $_SERVER['REMOTE_ADDR'] : $REMOTE_ADDR;
!
! if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
{
! if (preg_match('#^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)#', $_SERVER['HTTP_X_FORWARDED_FOR'], $ip_list))
{
! $private_ip = array('#^0\.#', '#^127\.0\.0\.1#', '#^192\.168\.#', '#^172\.16\.#', '#^10\.#', '#^224\.#', '#^240\.#');
! $this->ip = preg_replace($private_ip, $this->ip, $ip_list[1]);
}
}
}
|
|
From: Brian R. <hei...@us...> - 2003-06-03 06:51:42
|
Update of /cvsroot/phpmp/phpMP/languages/english
In directory sc8-pr-cvs1:/tmp/cvs-serv19972/languages/english
Modified Files:
lang_main.php
Log Message:
Template system fixed and working (to the best of my knowledge).
Index: lang_main.php
===================================================================
RCS file: /cvsroot/phpmp/phpMP/languages/english/lang_main.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** lang_main.php 17 May 2003 07:50:17 -0000 1.20
--- lang_main.php 3 Jun 2003 06:48:22 -0000 1.21
***************
*** 22,26 ****
*
*/
!
class Localization
{
--- 22,26 ----
*
*/
!
class Localization
{
|
|
From: Brian R. <hei...@us...> - 2003-06-02 22:32:36
|
Update of /cvsroot/phpmp/phpMP/templates/BlueMP In directory sc8-pr-cvs1:/tmp/cvs-serv28791/templates/BlueMP Modified Files: index.html Added Files: footer.html header.html left_column.html right_column.html Log Message: A trial run of the Template Engine from phpBB2.2. --- NEW FILE: footer.html --- --- NEW FILE: header.html --- --- NEW FILE: left_column.html --- --- NEW FILE: right_column.html --- Index: index.html =================================================================== RCS file: /cvsroot/phpmp/phpMP/templates/BlueMP/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** index.html 1 Jun 2003 20:42:30 -0000 1.1 --- index.html 2 Jun 2003 22:32:33 -0000 1.2 *************** *** 1,108 **** ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" dir="ltr"> ! <head> ! ! <title>phpMP :: Template</title> ! ! <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> ! ! <link rel="stylesheet" type="text/css" media="screen" href="css/base.css" /> ! ! </head> <body> ! <div id="container"> ! <div id="logo"><a href="index.html"><img src="images/phpMp_logo.png" width="252" height="78" alt="" /></a></div> ! <div id="logininfo"><a href="login">Login</a> - <a href="register">Register</a></div> ! ! <div id="leftboxes"> ! <div class="boxheader">Main Menu</div> ! <div class="boxcontent"> ! <ul> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! </ul> ! </div> ! <div class="boxheader">Left Box 1</div> ! <div class="boxcontent"> ! <ul> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! </ul> ! </div> ! <div class="boxheader">Login Box</div> ! <div class="boxcontent"> ! <form action="login" method="post"> ! <div>Username: <input type="text" name="username" value="" style="width: 100px;" /></div> ! <div>Password: <input type="password" name="password" value="" style="width: 100px;" /></div> ! <div><input type="submit" name="login" value="Logon!" /></div> ! </form> ! </div> ! </div> ! ! <div id="contentboxes"> ! <div class="boxheader">» Welcome Message</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">Articles</div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! <div class="boxheader">» Article</div> ! <div class="boxcontent"> ! <p>blah blah blah blah</p> ! </div> ! ! <div id="footer"> ! Copyright © 2003 ! </div> ! </div> ! <div id="rightboxes"> ! <div class="boxheader">Main Menu</div> ! <div class="boxcontent"> ! <ul> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! </ul> ! </div> ! <div class="boxheader">Left Box 1</div> ! <div class="boxcontent"> ! <ul> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! <li><a href="index">Link</a></li> ! </ul> ! </div> ! <div class="boxheader">Login Box</div> ! <div class="boxcontent"> ! <form action="login" method="post"> ! <div>Username: <input type="text" name="username" value="" style="width: 100px;" /></div> ! <div>Password: <input type="password" name="password" value="" style="width: 100px;" /></div> ! <div><input type="submit" name="login" value="Logon!" /></div> ! </form> ! </div> ! </div> - </div> </body> </html> --- 1,15 ---- ! <html> <body> ! phpMP Version: {C_Version}<br><br> ! Site Name: {C_Site_Name}<br> ! Site Address: {C_Site_Address}<br> ! Relative Path: {C_Rel_Path}<br> ! Default Template: {U_Template_Name}<br> ! Default Language: {U_Language}<br> ! The Current Date and Time: {U_Current_Time}<br> ! Current Logged User: {U_Username}<br><br> </body> </html> |
