phpslash-commit Mailing List for phpSlash (Page 103)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
This list is closed, nobody may subscribe to it.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(11) |
Nov
(59) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(52) |
Feb
(77) |
Mar
(118) |
Apr
(76) |
May
(106) |
Jun
(145) |
Jul
(9) |
Aug
(15) |
Sep
(78) |
Oct
(83) |
Nov
(105) |
Dec
(51) |
| 2003 |
Jan
(105) |
Feb
(100) |
Mar
(111) |
Apr
(149) |
May
(95) |
Jun
(56) |
Jul
(8) |
Aug
(2) |
Sep
|
Oct
(22) |
Nov
(117) |
Dec
(6) |
| 2004 |
Jan
(1) |
Feb
|
Mar
(3) |
Apr
(25) |
May
|
Jun
(11) |
Jul
(26) |
Aug
(85) |
Sep
(119) |
Oct
(312) |
Nov
(271) |
Dec
(5) |
| 2005 |
Jan
(6) |
Feb
|
Mar
|
Apr
(12) |
May
(7) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joe S. <joe...@us...> - 2002-01-17 22:16:44
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv12364/phpslash-ft Modified Files: CHANGES Log Message: updated docs list of templates Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.372 retrieving revision 1.373 diff -C2 -d -r1.372 -r1.373 *** CHANGES 2002/01/15 21:50:38 1.372 --- CHANGES 2002/01/17 22:16:41 1.373 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Jan-17 4:00PM CST Joe Stewart <jo...@be...> + [D] - phpslash.sgml - added references to new index templates. + 2002-Jan-15 3:30PM CST Joe Stewart <jo...@be...> [B] - index.php3 - removed unused related variable. |
|
From: Joe S. <joe...@us...> - 2002-01-15 21:50:41
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv3316/phpslash-ft/public_html
Modified Files:
article.php3 index.php3
Log Message:
related tweaks
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** article.php3 2002/01/15 16:34:41 1.56
--- article.php3 2002/01/15 21:50:38 1.57
***************
*** 126,131 ****
$t->set_file(article, $tplfile); //"article.tpl");
- $related = $story->getRelated($story_id);
-
/* Now the comments */
--- 126,129 ----
Index: index.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** index.php3 2002/01/08 21:38:23 1.51
--- index.php3 2002/01/15 21:50:38 1.52
***************
*** 55,66 ****
} else {
$tplfile = "index2colright.tpl";
- $rightblocks = $related . $rightblocks;
}
} elseif (empty($rightblocks)) {
$tplfile = "index2colleft.tpl";
- $leftblocks .= $related;
} else {
$tplfile = "index3col.tpl";
- $rightblocks = $related . $rightblocks;
}
--- 55,63 ----
|
|
From: Joe S. <joe...@us...> - 2002-01-15 21:50:41
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv3316/phpslash-ft Modified Files: CHANGES Log Message: related tweaks Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.371 retrieving revision 1.372 diff -C2 -d -r1.371 -r1.372 *** CHANGES 2002/01/15 16:32:13 1.371 --- CHANGES 2002/01/15 21:50:38 1.372 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Jan-15 3:30PM CST Joe Stewart <jo...@be...> + [B] - index.php3 - removed unused related variable. + article.php3 - removed extra related links call. + 2002-Jan-15 10:30AM CST Joe Stewart <jo...@be...> [B] - 6_to_065.sql - corrected bug [ #471581 ] sql table |
|
From: Joe S. <joe...@us...> - 2002-01-15 16:43:18
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv23696/phpslash-ft/public_html
Modified Files:
indextpl3col.php3
Log Message:
bugfix [ #503769 ]
Index: indextpl3col.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/indextpl3col.php3,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** indextpl3col.php3 2002/01/15 16:13:06 1.13
--- indextpl3col.php3 2002/01/15 16:43:15 1.14
***************
*** 48,52 ****
$template->set_var(array(
! ROOTDIR => $_PSL[rootur],
IMAGEDIR => $_PSL[imageurl],
BREADCRUMB => $breadcrumb,
--- 48,52 ----
$template->set_var(array(
! ROOTDIR => $_PSL[rooturl],
IMAGEDIR => $_PSL[imageurl],
BREADCRUMB => $breadcrumb,
|
|
From: Joe S. <joe...@us...> - 2002-01-15 16:34:44
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv20367/phpslash-ft/public_html
Modified Files:
article.php3
Log Message:
bugfix [ #503769 ]
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** article.php3 2002/01/08 21:43:57 1.55
--- article.php3 2002/01/15 16:34:41 1.56
***************
*** 57,62 ****
$t->set_file(article, "article-pf.tpl");
$t->set_var(array(
! STORY_URL => "".$_PSL[rooturl].$_PSL[phpself]."?story_id=".$story_id."",
! SITENAME => $_PSL[site_name],
PAGETITLE => $pagetitle,
TITLE => $ttitle,
--- 57,62 ----
$t->set_file(article, "article-pf.tpl");
$t->set_var(array(
! STORY_URL => $_PSL[rooturl]."/article.php3?story_id=".$story_id,
! SITENAME => $_PSL[site_name],
PAGETITLE => $pagetitle,
TITLE => $ttitle,
|
|
From: Joe S. <joe...@us...> - 2002-01-15 16:32:16
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65 In directory usw-pr-cvs1:/tmp/cvs-serv19124/phpslash-ft/tables/0.65 Modified Files: 6_to_65.sql Log Message: bugfix [ #471581 ] Index: 6_to_65.sql =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/6_to_65.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** 6_to_65.sql 2001/11/20 14:49:57 1.4 --- 6_to_65.sql 2002/01/15 16:32:13 1.5 *************** *** 1,6 **** ALTER TABLE psl_poll_answer CHANGE answer_id answer_id SMALLINT not null; ALTER TABLE psl_poll_question ADD current tinyint(4) default '0' not null; ! ALTER TABLE psl_block CHANGE source_url source_url VARCHAR (255) not null; ! ALTER TABLE psl_block CHANGE source_url source_url VARCHAR (255) not null; ALTER TABLE psl_topic_lut ADD INDEX(story_id); ALTER TABLE psl_author ADD perms VARCHAR (255); --- 1,6 ---- ALTER TABLE psl_poll_answer CHANGE answer_id answer_id SMALLINT not null; ALTER TABLE psl_poll_question ADD current tinyint(4) default '0' not null; ! ALTER TABLE psl_block CHANGE source_url source_url VARCHAR (254) not null; ! ALTER TABLE psl_block CHANGE location location VARCHAR (254) not null; ALTER TABLE psl_topic_lut ADD INDEX(story_id); ALTER TABLE psl_author ADD perms VARCHAR (255); |
|
From: Joe S. <joe...@us...> - 2002-01-15 16:32:16
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv19124/phpslash-ft Modified Files: CHANGES Log Message: bugfix [ #471581 ] Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.370 retrieving revision 1.371 diff -C2 -d -r1.370 -r1.371 *** CHANGES 2002/01/15 16:13:06 1.370 --- CHANGES 2002/01/15 16:32:13 1.371 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Jan-15 10:30AM CST Joe Stewart <jo...@be...> + [B] - 6_to_065.sql - corrected bug [ #471581 ] sql table + maintenance 0.65b1. ( thanks luis m.) + 2002-Jan-15 10:00AM CST Joe Stewart <jo...@be...> [B] - article.php3 - corrected bug [ #503769 ]. printer friendly view |
|
From: Joe S. <joe...@us...> - 2002-01-15 16:13:10
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv10621/phpslash-ft Modified Files: CHANGES Log Message: bugfix [ #503769 ] Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.369 retrieving revision 1.370 diff -C2 -d -r1.369 -r1.370 *** CHANGES 2002/01/11 16:29:18 1.369 --- CHANGES 2002/01/15 16:13:06 1.370 *************** *** 13,16 **** --- 13,20 ---- 9 - Removal of something (kill -9 :) + 2002-Jan-15 10:00AM CST Joe Stewart <jo...@be...> + [B] - article.php3 - corrected bug [ #503769 ]. printer friendly view + had a bad link (thanks Aaron Seth). + 2002-Jan-11 10:30AM CST Joe Stewart <jo...@be...> [W] - Story.class, functions.inc, SKIN and STORY_ID are available |
|
From: Joe S. <joe...@us...> - 2002-01-15 16:13:09
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv10621/phpslash-ft/public_html
Modified Files:
indextpl3col.php3
Log Message:
bugfix [ #503769 ]
Index: indextpl3col.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/indextpl3col.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** indextpl3col.php3 2001/12/14 22:14:36 1.12
--- indextpl3col.php3 2002/01/15 16:13:06 1.13
***************
*** 48,52 ****
$template->set_var(array(
! ROOTDIR => $_PSL[rootdir],
IMAGEDIR => $_PSL[imageurl],
BREADCRUMB => $breadcrumb,
--- 48,52 ----
$template->set_var(array(
! ROOTDIR => $_PSL[rootur],
IMAGEDIR => $_PSL[imageurl],
BREADCRUMB => $breadcrumb,
|
|
From: Joe S. <joe...@us...> - 2002-01-11 16:30:27
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv31653/phpslash-ft/class
Modified Files:
Story.class functions.inc
Log Message:
STORY_ID available to storyIndex.tpl
Index: Story.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Story.class,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Story.class 2001/12/14 03:58:18 1.26
--- Story.class 2002/01/11 16:30:22 1.27
***************
*** 305,309 ****
$this->template->set_var(array(
! TITLEBAR => $titlebar,
TITLE => $ary[title],
INTRO_TEXT => $ary[intro_text],
--- 305,311 ----
$this->template->set_var(array(
! SKIN => $this->psl[skin],
! STORY_ID => $story_id,
! TITLEBAR => $titlebar,
TITLE => $ary[title],
INTRO_TEXT => $ary[intro_text],
***************
*** 456,459 ****
--- 458,462 ----
$this->template->set_var(array(
+ SKIN => $this->psl[skin],
TITLEBAR => $titlebar,
TITLE => $stories_ary[$i][title],
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** functions.inc 2002/01/05 20:45:44 1.87
--- functions.inc 2002/01/11 16:30:22 1.88
***************
*** 148,157 ****
$stempl->set_var(array(
! IMAGEDIR => $_PSL[imageurl]
! ));
!
! $stempl->set_var(array(
! WIDTH => $width,
! TITLE => $title
));
$stempl->parse(TITLE, "titlebar");
--- 148,155 ----
$stempl->set_var(array(
! SKIN => $_PSL[skin],
! IMAGEDIR => $_PSL[imageurl],
! WIDTH => $width,
! TITLE => $title
));
$stempl->parse(TITLE, "titlebar");
***************
*** 209,212 ****
--- 207,211 ----
$templ->set_var(array(
+ SKIN => $_PSL[skin],
WIDTH => $width,
ALIGN => $align,
|
|
From: Joe S. <joe...@us...> - 2002-01-11 16:29:27
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv31362/phpslash-ft
Modified Files:
CHANGES
Log Message:
STORY_ID available to storyIndex.tpl
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.368
retrieving revision 1.369
diff -C2 -d -r1.368 -r1.369
*** CHANGES 2002/01/09 17:05:33 1.368
--- CHANGES 2002/01/11 16:29:18 1.369
***************
*** 13,17 ****
9 - Removal of something (kill -9 :)
! 2002-Jan-0 9:45AM CST Joe Stewart <jo...@be...>
[W] - login.php3 now conforms to Peter's columns sensing index page.
The text shown is now in an Administration block for easy editing.
--- 13,21 ----
9 - Removal of something (kill -9 :)
! 2002-Jan-11 10:30AM CST Joe Stewart <jo...@be...>
! [W] - Story.class, functions.inc, SKIN and STORY_ID are available
! to a couple more templates.
!
! 2002-Jan-09 9:45AM CST Joe Stewart <jo...@be...>
[W] - login.php3 now conforms to Peter's columns sensing index page.
The text shown is now in an Administration block for easy editing.
***************
*** 20,24 ****
stale active sessions, and data from infolog.
! 2002-Jan-0 9:45AM CST Joe Stewart <jo...@be...>
[B] - slash-all.sql - Set current poll for poll block.
Set block columns to left and right. Removed a couple of empty
--- 24,28 ----
stale active sessions, and data from infolog.
! 2002-Jan-09 9:45AM CST Joe Stewart <jo...@be...>
[B] - slash-all.sql - Set current poll for poll block.
Set block columns to left and right. Removed a couple of empty
|
|
From: Joe S. <joe...@us...> - 2002-01-09 17:11:31
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv29334/phpslash-ft/public_html
Modified Files:
login.php3
Log Message:
login tweaks
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** login.php3 2002/01/09 17:05:34 1.11
--- login.php3 2002/01/09 17:11:29 1.12
***************
*** 1,6 ****
<?php
// $Id$
! $pagetitle="Home"; # The name to be displayed in the header
! $xsiteobject = "Home Page"; #This Defines The META Tag Object Type
require("config.php3");
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
--- 1,6 ----
<?php
// $Id$
! $pagetitle="Administration"; # The name to be displayed in the header
! $xsiteobject = "Administration Page"; #This Defines The META Tag Object Type
require("config.php3");
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
|
|
From: Joe S. <joe...@us...> - 2002-01-09 17:05:37
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv27014/phpslash-ft/public_html
Modified Files:
login.php3 admin.php3
Log Message:
login tweaks
Index: login.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/login.php3,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** login.php3 2001/12/14 22:14:36 1.10
--- login.php3 2002/01/09 17:05:34 1.11
***************
*** 1,86 ****
<?php
! // $Id$
!
! $pagetitle = "Administration"; # The name to be displayed in the header
! $xsiteobject = "Administration"; # Defines The META TAG Page Type
require("config.php3");
-
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
! if ($logout) {
! # $auth->unauth();
! # $auth->auth_loginform();
$username = $auth->auth['uname'];
$auth->auth["error"] = sprintf(pslgetText("%s logged out."), $username);
$auth->auth[uid] = "nobody";
$auth->auth[perm] = "";
! // slashhead($pagetitle,$xsiteobject);
! // $debug = true;
! // debug("Auth",$auth->auth);
! // $login = "yes";
! // $auth->login_if($login);
! $auth->auth_loginform();
!
! } elseif ($perm->have_perm("user")) {
! $story = new Story;
! $block = new Block_i;
! /* parse cmd line variables into array */
! while ( list($key, $val) = each($HTTP_GET_VARS )) {
! $ary[$key] = $val;
! }
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
! $section = $_PSL[site_homesection];
! if(!$section) {
! $section = "Home";
! }
! $ary[section] = $section;
! } else {
! $pagetitle .= " - $section";
! }
! slashhead($pagetitle,$xsiteobject);
! titlebar("100%","Welcome to the Administration Screen");
! $ary = $auth->auth;
! /*
! while (list($key,$val) = each($auth->auth)) {
! echo "KEY: $key => VAL: $val<BR>\n";
!
}
! */
! $allstories = breadcrumb( $ary);
! $allstories = "<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>\n";
! $ary['section'] = "Admin";
! $allblocks = $block->getBlocks($ary);
!
! $template = new Template($_PSL[templatedir]);
! $template->debug = 0;
! $template->set_file(array(
! index => "index.tpl"
! ));
!
! $template->set_var(array(
! ROOTDIR => $_PSL[rooturl],
! IMAGEDIR => $_PSL[imageurl],
! STORY_COLUMN => $allstories,
! BLOCK_COLUMN => $allblocks
! ));
! $template->parse(OUT,"index");
! $template->p(OUT);
! slashfoot();
} else {
! Header("Location: " . $_PSL[rooturl]);
}
- page_close();
?>
--- 1,98 ----
<?php
! // $Id$
! $pagetitle="Home"; # The name to be displayed in the header
! $xsiteobject = "Home Page"; #This Defines The META Tag Object Type
require("config.php3");
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
! if (isset($cancel)) {
! Header("Location: " . $_PSL[rooturl]); // go home
! }
! if ($logout) {
$username = $auth->auth['uname'];
$auth->auth["error"] = sprintf(pslgetText("%s logged out."), $username);
$auth->auth[uid] = "nobody";
$auth->auth[perm] = "";
! }
! $auth->login_if(!$perm->have_perm(user));
! // Objects
! // $poll = new Poll;
! $story = new Story;
! $block = new Block_i;
! $db = new slashDB;
+ // Start of Page
! /* parse cmd line variables into array */
! while ( list($key, $val) = each($HTTP_GET_VARS )) {
! $ary[$key] = $val;
! }
! /* defaults for main "index" page */
! if ((!$section) AND (!$section_id)){
! $section = $_PSL[site_homesection];
! if(!$section) {
! $section = "Home";
}
! $ary[section] = $section;
! } else {
! $pagetitle .= " - $section";
! }
! $ary[section] = "Admin";
! $breadcrumb = breadcrumb( $ary);
! $_PSL['metatags']['object'] = $xsiteobject;
+ slashhead($pagetitle,$_PSL['metatags']);
+ $allstories = $story->getStories($ary);
+ $leftblocks = $block->getBlocks($ary, "left");
+ $centerblocks = $block->getBlocks($ary, "center");
+ $rightblocks = $block->getBlocks($ary, "right");
+
+ if (empty($leftblocks)) {
+ if (empty($rightblocks)) {
+ // $centerblocks = $block->getBlocks($ary);
+ // $tplfile = "index1col.tpl";
+ // default to 2 column for transparent upgrade
+ $rightblocks = $block->getBlocks($ary);
+ $tplfile = "index2colright.tpl";
+ } else {
+ $tplfile = "index2colright.tpl";
+ $rightblocks = $related . $rightblocks;
+ }
+ } elseif (empty($rightblocks)) {
+ $tplfile = "index2colleft.tpl";
+ $leftblocks .= $related;
} else {
! $tplfile = "index3col.tpl";
! $rightblocks = $related . $rightblocks;
}
+ $template = new Template($_PSL[templatedir]);
+ $template->debug = 0;
+ $template->set_file(array(
+ index => $tplfile //"index3col.tpl"
+ ));
+
+ $template->set_var(array(
+ ROOTDIR => $_PSL[rooturl],
+ IMAGEDIR => $_PSL[imageurl],
+ BREADCRUMB => $breadcrumb,
+ STORY_COLUMN => $allstories,
+ LEFT_BLOCK_COLUMN => $leftblocks,
+ CENTER_BLOCK_COLUMN => $centerblocks,
+ RIGHT_BLOCK_COLUMN => $rightblocks
+ ));
+
+ $template->parse(OUT,"index");
+ $template->p(OUT);
+
+ slashfoot();
+ page_close();
?>
Index: admin.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/admin.php3,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** admin.php3 2001/05/17 06:48:48 1.28
--- admin.php3 2002/01/09 17:05:34 1.29
***************
*** 1,122 ****
<?php
- // $Id$
- unset($seclev); # Security: Don´t use User Vars
- $pagetitle = "Administration"; # The name to be displayed in the header
- $xsiteobject = "Administration"; # Defines The META TAG Page Type
- require("config.php3");
-
- function display_login() {
- global $PHP_SELF,$templatedir;
-
- $templ = new Template($templatedir);
- $templ->debug = 0;
- $templ->set_file(array(
- admin => "admin.tpl"
- ));
-
- $templ->set_var(array(
- MESSAGE => "You have no authority. Login to gain it.",
- TITLEBAR => getTitleBar("100%","Login"),
- ACTION_URL => "$PHP_SELF"
- ));
- $templ->parse(OUT,"admin");
- $templ->p(OUT);
- }
-
- /*
- *
- * END OF FUNCTIONS. START OF PAGE.
- *
- */
-
- $sl_q = new slashDB;
- page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
-
- /* If there is a username and a password (but not a seclev) look it up
- and if there's a match record the aid, pwd and seclev in the session */
-
- if (isset($password) and isset($author_name) && !(isset($seclev))) {
- $query = "SELECT seclev,author_id
- FROM psl_author
- WHERE author_name='$author_name'
- AND password='$password'";
-
- $sl_q->query($query);
- if ($sl_q->next_record()) {
- $seclev = $sl_q->Record["seclev"];
- $author_id = $sl_q->Record["author_id"];
- $sess->register("author_id");
- $sess->register("author_name");
- $sess->register("seclev");
- $sess->register("password");
- }
- // Log it :)
- logwrite("Admin Login", "$author_name ($author_id) logged in");
- }
-
- /* ---------------------------------------------------------------------
- Check to see if user wants to log out, if so, delete their session.
- We must do this after a page_open call, but before any data is sent to
- the browser so we can delete the session cookie. Note that you can't
- call page_close one you've deleted the session
- ---------------------------------------------------------------------*/
- if ($op=="logout") {
- logwrite("Admin Logout", "$author_name ($author_id) logged out");
- $sess->delete();
- $seclev = 0;
- $author_name = "";
- $author_id = "";
- $password = "";
- echo "Session destroyed. You are now logged out.";
- }
-
- slashhead($pagetitle,$xsiteobject);
-
- /* Check if any of the security vars are missing, if so, make someone login */
-
- if (!(isset($seclev) && isset($author_name) && isset($password))) {
-
- display_login();
-
- } else {
-
- // Need to check for password from db even if $author_name and $pwd
- // is given via GET
- // Heh. This will kill any seclev passed via GET!
-
- // [nh.. This double checks the seclev from db
- // It seems like a useless feature becasue it's been unset and
- // re-read from the session data, or checked already, seems like
- // an extra db call for nothing to me]
- $seclev = 0;
- $sl_q = new slashDB;
- $sl_q->query("SELECT seclev
- FROM psl_author
- WHERE author_name='$author_name'
- AND password='$password'");
- if ($sl_q->next_record()) {
- $seclev = $sl_q->Record["seclev"];
- }
-
- if ($seclev > 0) {
-
- titlebar("100%","Welcome to the Administration Screen");
- echo "<BR><BR>A bunch of cool things like latest site activity and stats should go here. But until they do, just pick something from the NavBar and go about your duties...<BR><BR>\n";
- echo "</B>";
-
- } else {
-
- display_login();
-
- }
- }
-
- echo "</FONT> ";
! slashfoot();
!
! if ($op != "logout") {
! page_close();
! }
?>
--- 1,6 ----
<?php
! Header("Location: login.php3");
! exit;
?>
|
|
From: Joe S. <joe...@us...> - 2002-01-09 17:05:36
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65
In directory usw-pr-cvs1:/tmp/cvs-serv27014/phpslash-ft/tables/0.65
Modified Files:
slash-all.sql
Log Message:
login tweaks
Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slash-all.sql 2002/01/09 15:46:12 1.5
--- slash-all.sql 2002/01/09 17:05:34 1.6
***************
*** 22,28 ****
#
- INSERT INTO active_sessions (sid, name, val, changed) VALUES ( 'aaa4e80aac718a207377c412309e0f02', 'slashSess', 'c2xhc2hTZXNzOiR0aGlzLT5pbiA9ICcnOyAkdGhpcy0+cHQgPSBhcnJheSgpOyAkdGhpcy0+cHRbJ2F1dGgnXSA9ICcxJzsgJEdMT0JBTFNbJ2F1dGgnXSA9IG5ldyBzbGFzaEF1dGg7ICRHTE9CQUxTWydhdXRoJ10tPmF1dGggPSBhcnJheSgpOyAkR0xPQkFMU1snYXV0aCddLT5hdXRoWyd1aWQnXSA9ICcnOyAkR0xPQkFMU1snYXV0aCddLT5hdXRoWydwZXJtJ10gPSAnJzsgJEdMT0JBTFNbJ2F1dGgnXS0+YXV0aFsnZXhwJ10gPSAnMCc7ICRHTE9CQUxTWydhdXRoJ10tPmF1dGhbJ3JlZnJlc2gnXSA9ICcyMTQ3NDgzNjQ3JzsgJEdMT0JBTFNbJ2F1dGgnXS0+YXV0aFsndW5hbWUnXSA9ICdnb2QnOyA=', '20010516095549');
- INSERT INTO active_sessions (sid, name, val, changed) VALUES ( 'bcbb12bfe6310e6767ff65600193fdf2', 'slashSess', 'c2xhc2hTZXNzOiR0aGlzLT5pbiA9ICcnOyAkdGhpcy0+cHQgPSBhcnJheSgpOyAkdGhpcy0+cHRbJ2F1dGgnXSA9ICcxJzsgJEdMT0JBTFNbJ2F1dGgnXSA9IG5ldyBzbGFzaEF1dGg7ICRHTE9CQUxTWydhdXRoJ10tPmF1dGggPSBhcnJheSgpOyAkR0xPQkFMU1snYXV0aCddLT5hdXRoWyd1aWQnXSA9ICdub2JvZHknOyAkR0xPQkFMU1snYXV0aCddLT5hdXRoWydwZXJtJ10gPSAnJzsgJEdMT0JBTFNbJ2F1dGgnXS0+YXV0aFsnZXhwJ10gPSAnMjE0NzQ4MzY0Nyc7ICRHTE9CQUxTWydhdXRoJ10tPmF1dGhbJ3JlZnJlc2gnXSA9ICcyMTQ3NDgzNjQ3Jzsg', '20010514092144');
- INSERT INTO active_sessions (sid, name, val, changed) VALUES ( '5b3688d51a767cb29ad53d5d9d2d4e8a', 'slashSess', 'c2xhc2hTZXNzOiR0aGlzLT5pbiA9ICcnOyAkdGhpcy0+cHQgPSBhcnJheSgpOyAkdGhpcy0+cHRbJ2F1dGgnXSA9ICcxJzsgJEdMT0JBTFNbJ2F1dGgnXSA9IG5ldyBzbGFzaEF1dGg7ICRHTE9CQUxTWydhdXRoJ10tPmF1dGggPSBhcnJheSgpOyAkR0xPQkFMU1snYXV0aCddLT5hdXRoWyd1aWQnXSA9ICcxJzsgJEdMT0JBTFNbJ2F1dGgnXS0+YXV0aFsncGVybSddID0gJ3Jvb3Qsbm9ib2R5LHVzZXIsdG9waWMsc3Rvcnksc2VjdGlvbixzdWJtaXNzaW9uLGJsb2NrLHBvbGwsYXV0aG9yLHZhcmlhYmxlLGdsb3NzYXJ5LG1haWxpbmdsaXN0LGxvZ2dpbmcnOyAkR0xPQkFMU1snYXV0aCddLT5hdXRoWydleHAnXSA9ICc5OTAwMzM4NzgnOyAkR0xPQkFMU1snYXV0aCddLT5hdXRoWydyZWZyZXNoJ10gPSAnOTkwMDMyNDI2JzsgJEdMT0JBTFNbJ2F1dGgnXS0+YXV0aFsndW5hbWUnXSA9ICdnb2QnOyA=', '20010516100938');
# --------------------------------------------------------
--- 22,25 ----
***************
*** 362,366 ****
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '0', '20011002152749', '', '', '', 'a:2:{s:6:\"column\";s:5:\"left\";s:0:\"\";s:0:\"\";}', '50');
# --------------------------------------------------------
--- 359,364 ----
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '0', '20011002152749', '', '', '', 'a:2:{s:6:\"column\";s:4:\"left\";s:0:\"\";s:0:\"\";}', '50');
! INSERT INTO psl_block VALUES( '148', '1', 'Administration', '0', '20020109103042', '', '', '<BR><BR>A bunch of cool things like latest site activity and stats should go here. <BR> But until they do, just pick something from the NavBar and go about your duties...<BR><BR>', 'a:2:{s:6:\"column\";s:6:\"center\";s:0:\"\";s:0:\"\";}', '90');
# --------------------------------------------------------
***************
*** 415,427 ****
#
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '45', '0', '12', '0', '2000-09-04 02:04:02', 'ajay', 'ss...@od...', '127.0.0.1', 'No Subject Needed', 'This is a comments', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '46', '0', '12', '0', '2000-09-04 02:04:41', 'Randy', 'Rhodes', '127.0.0.1', 'Ozzy stuff.', 'I didn\'t see Ozzfest. Now that I think about it, I\'ve never seen an Ozzfest. ', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '47', '45', '12', '0', '2000-09-04 02:04:55', 'test', 'test', '127.0.0.1', 'Re: No Subject Needed', 'testet', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '48', '47', '12', '0', '2000-09-04 02:05:55', 'tesef', 'sefsef', '127.0.0.1', 'Re: Re: No Subject Needed', 'sefsefs', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '49', '48', '12', '0', '2000-09-04 02:06:10', 'ssfse', 'funkyu.', '127.0.0.1', 'Re: Re: Re: No Subject Needed', 'funky days are back again', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '54', '0', '15', '0', '2000-10-24 15:04:02', 'foo', 'foo', '127.0.0.1', 'foo', 'foo', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '55', '54', '15', '0', '2000-10-24 15:04:12', 'foo', 'foo', '127.0.0.1', 'foo', 'foo', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '56', '0', '7', '0', '2000-10-25 20:21:56', 'foo', 'foo', '127.0.0.1', 'foo', 'foo', '0');
- INSERT INTO psl_comment (comment_id, parent_id, story_id, user_id, date, name, email, ip, subject, comment_text, pending) VALUES ( '57', '0', '7', '0', '2000-10-25 20:22:06', 'foo', 'foo', '127.0.0.1', 'foo', 'foo', '0');
# --------------------------------------------------------
--- 413,416 ----
***************
*** 441,450 ****
INSERT INTO psl_commentcount (count_id, count) VALUES ( '19', '0');
- INSERT INTO psl_commentcount (count_id, count) VALUES ( '7', '2');
- INSERT INTO psl_commentcount (count_id, count) VALUES ( '4', '0');
- INSERT INTO psl_commentcount (count_id, count) VALUES ( '3', '0');
INSERT INTO psl_commentcount (count_id, count) VALUES ( '11', '0');
- INSERT INTO psl_commentcount (count_id, count) VALUES ( '12', '5');
- INSERT INTO psl_commentcount (count_id, count) VALUES ( '15', '2');
INSERT INTO psl_commentcount (count_id, count) VALUES ( '18', '0');
--- 430,434 ----
***************
*** 486,524 ****
#
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '54', '2000-12-04 17:15:49', 'Block Admin', 'Deleted block 146');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '55', '2000-12-04 17:15:53', 'Block Admin', 'Deleted block 125');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '56', '2000-12-04 17:16:25', 'Block Addition', 'Added block 131');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '57', '2000-12-04 17:16:56', 'Block Addition', 'Added block 131');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '58', '2000-12-04 17:19:36', 'Story Submission', '172.16.0.5 submitted a story as an admin');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '59', '2000-12-04 17:19:43', 'Story Admin', 'god (1) added new story');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '60', '2000-12-04 17:20:03', 'Story Admin', 'god (1) added new story');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '61', '2000-12-04 17:30:32', 'Admin Logout', 'god (1) logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '62', '2001-05-08 07:41:23', 'Admin Logout', 'god (1) logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '63', '2001-05-08 07:42:01', 'Admin Login', 'god (1) logged in');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '64', '2001-05-08 07:42:01', 'Admin Logout', 'god (1) logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '65', '2001-05-08 07:49:30', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '66', '2001-05-08 07:50:45', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '67', '2001-05-08 18:07:43', 'Admin Login', ' () logged in');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '68', '2001-05-08 21:43:46', 'Admin Logout', 'god (1) logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '69', '2001-05-08 21:48:30', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '70', '2001-05-08 21:55:30', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '71', '2001-05-08 21:55:54', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '72', '2001-05-08 21:56:27', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '73', '2001-05-08 21:57:19', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '74', '2001-05-08 21:58:08', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '75', '2001-05-08 21:58:43', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '76', '2001-05-08 21:59:57', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '77', '2001-05-08 22:00:16', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '78', '2001-05-08 22:00:36', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '79', '2001-05-08 22:13:07', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '80', '2001-05-08 22:13:32', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '81', '2001-05-08 22:14:45', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '82', '2001-05-08 22:15:14', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '83', '2001-05-08 22:15:41', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '84', '2001-05-08 22:15:57', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '85', '2001-05-08 22:16:15', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '86', '2001-05-08 22:23:32', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '87', '2001-05-08 22:24:14', 'Admin Logout', ' () logged out');
- INSERT INTO psl_infolog (id, time, description, data) VALUES ( '88', '2001-05-08 22:24:33', 'Admin Logout', ' () logged out');
# --------------------------------------------------------
--- 470,473 ----
***************
*** 691,694 ****
--- 640,646 ----
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '238', '144', '3');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '244', '147', '8');
+ INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '1', '148', '8');
+
+
# --------------------------------------------------------
|
|
From: Joe S. <joe...@us...> - 2002-01-09 17:05:36
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv27014/phpslash-ft
Modified Files:
CHANGES
Log Message:
login tweaks
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.367
retrieving revision 1.368
diff -C2 -d -r1.367 -r1.368
*** CHANGES 2002/01/09 15:46:12 1.367
--- CHANGES 2002/01/09 17:05:33 1.368
***************
*** 14,17 ****
--- 14,24 ----
2002-Jan-0 9:45AM CST Joe Stewart <jo...@be...>
+ [W] - login.php3 now conforms to Peter's columns sensing index page.
+ The text shown is now in an Administration block for easy editing.
+ admin.php3 points to login.php3 for transparent upgrade from 0.62.
+ slash-all.sql - new Administration block. Removed orphan comments,
+ stale active sessions, and data from infolog.
+
+ 2002-Jan-0 9:45AM CST Joe Stewart <jo...@be...>
[B] - slash-all.sql - Set current poll for poll block.
Set block columns to left and right. Removed a couple of empty
|
|
From: Joe S. <joe...@us...> - 2002-01-09 15:46:16
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.65
In directory usw-pr-cvs1:/tmp/cvs-serv1918/phpslash-ft/tables/0.65
Modified Files:
slash-all.sql
Log Message:
current poll set for poll block
Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.65/slash-all.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slash-all.sql 2001/10/02 20:57:17 1.4
--- slash-all.sql 2002/01/09 15:46:12 1.5
***************
*** 202,206 ****
</form>
<!-- END: pollDisplay.tpl -->
! ', 'a:2:{s:5:\"width\";s:3:\"160\";s:0:\"\";s:0:\"\";}', '0');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '139', '7', 'Sections', '3600', '20010516092026', '', '', '<!-- sectionsblock.tpl begin-->
<ul>
--- 202,206 ----
</form>
<!-- END: pollDisplay.tpl -->
! ', 'a:3:{s:5:\"width\";s:3:\"160\";s:6:\"column\";s:5:\"right\";s:0:\"\";s:0:\"\";}', '0');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '139', '7', 'Sections', '3600', '20010516092026', '', '', '<!-- sectionsblock.tpl begin-->
<ul>
***************
*** 210,214 ****
<!-- sectionsblock.tpl end-->
! ', 'a:2:{s:6:\"column\";s:1:\"1\";s:5:\"width\";s:3:\"160\";}', '99');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '130', '4', '%%', '3600', '20010516092026', '', '', '<table cellpadding=2 border=0 BGCOLOR=#000066>
<tr BGCOLOR=#FFFFFF>
--- 210,214 ----
<!-- sectionsblock.tpl end-->
! ', 'a:3:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";s:0:\"\";s:0:\"\";}', '99');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '130', '4', '%%', '3600', '20010516092026', '', '', '<table cellpadding=2 border=0 BGCOLOR=#000066>
<tr BGCOLOR=#FFFFFF>
***************
*** 324,328 ****
<!-- topicsblock.tpl end-->
! ', 'a:2:{s:6:\"column\";s:1:\"1\";s:5:\"width\";s:3:\"160\";}', '90');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '141', '8', 'Feature Topics', '3600', '20001123204901', '', 'section=features', '<!-- topicsblock.tpl begin-->
<ul>
--- 324,328 ----
<!-- topicsblock.tpl end-->
! ', 'a:3:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";s:0:\"\";s:0:\"\";}', '90');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '141', '8', 'Feature Topics', '3600', '20001123204901', '', 'section=features', '<!-- topicsblock.tpl begin-->
<ul>
***************
*** 337,341 ****
<!-- topicsblock.tpl end-->
! ', 'a:2:{s:5:\"width\";s:3:\"160\";s:6:\"column\";s:1:\"1\";}', '90');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '142', '8', 'Topics', '3600', '20010516092026', '', 'section=Home', '<!-- topicsblock.tpl begin-->
<ul>
--- 337,341 ----
<!-- topicsblock.tpl end-->
! ', 'a:3:{s:5:\"width\";s:3:\"160\";s:6:\"column\";s:5:\"right\";s:0:\"\";s:0:\"\";}', '90');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '142', '8', 'Topics', '3600', '20010516092026', '', 'section=Home', '<!-- topicsblock.tpl begin-->
<ul>
***************
*** 345,354 ****
<!-- topicsblock.tpl end-->
! ', 'a:2:{s:6:\"column\";s:1:\"1\";s:5:\"width\";s:3:\"160\";}', '90');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '143', '6', 'Got Foo?', '3600', '20010516092026', '', 'query=foo', '<!-- queryblock.tpl begin-->
{query_block}
<!-- queryblock.tpl end-->
! ', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '50');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '144', '6', 'Most Popular Stories', '3600', '20010516092026', '', 'order=hits', '<!-- queryblock.tpl begin-->
--- 345,354 ----
<!-- topicsblock.tpl end-->
! ', 'a:3:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";s:0:\"\";s:0:\"\";}', '90');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '143', '6', 'Got Foo?', '3600', '20010516092026', '', 'query=foo', '<!-- queryblock.tpl begin-->
{query_block}
<!-- queryblock.tpl end-->
! ', 'a:3:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";s:0:\"\";s:0:\"\";}', '50');
INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES ( '144', '6', 'Most Popular Stories', '3600', '20010516092026', '', 'order=hits', '<!-- queryblock.tpl begin-->
***************
*** 362,366 ****
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '0', '20011002152749', '', '', '', 'a:2:{s:6:\"column\";s:5:\"right\";s:0:\"\";s:0:\"\";}', '50');
# --------------------------------------------------------
--- 362,366 ----
', 'a:2:{s:6:\"column\";s:5:\"right\";s:5:\"width\";s:3:\"160\";}', '30');
! INSERT INTO psl_block (id, type, title, expire_length, last_update, location, source_url, cache_data, block_options, ordernum) VALUES( '147', '10', 'Skins', '0', '20011002152749', '', '', '', 'a:2:{s:6:\"column\";s:5:\"left\";s:0:\"\";s:0:\"\";}', '50');
# --------------------------------------------------------
***************
*** 600,604 ****
#
! INSERT INTO psl_poll_question (question_id, question_text, question_total_votes, date, current) VALUES ( '18', 'Do you like phpSlash?', '1', '2000-12-04 17:15:40', '0');
# --------------------------------------------------------
--- 600,604 ----
#
! INSERT INTO psl_poll_question (question_id, question_text, question_total_votes, date, current) VALUES ( '18', 'Do you like phpSlash?', '1', '2000-12-04 17:15:40', '1');
# --------------------------------------------------------
***************
*** 688,697 ****
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '268', '142', '3');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '279', '139', '7');
- INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '237', '143', '3');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '239', '144', '4');
- INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '240', '145', '3');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '238', '144', '3');
! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '236', '143', '5');
! INSERT INTO psl_section_block_lut VALUES( '244', '147', '8');
# --------------------------------------------------------
--- 688,694 ----
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '268', '142', '3');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '279', '139', '7');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '239', '144', '4');
INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '238', '144', '3');
! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES ( '244', '147', '8');
# --------------------------------------------------------
|
|
From: Joe S. <joe...@us...> - 2002-01-09 15:46:15
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv1918/phpslash-ft Modified Files: CHANGES Log Message: current poll set for poll block Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.366 retrieving revision 1.367 diff -C2 -d -r1.366 -r1.367 *** CHANGES 2002/01/08 21:38:23 1.366 --- CHANGES 2002/01/09 15:46:12 1.367 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-Jan-0 9:45AM CST Joe Stewart <jo...@be...> + [B] - slash-all.sql - Set current poll for poll block. + Set block columns to left and right. Removed a couple of empty + example blocks from the default view after installation. + 2002-Jan-08 3:30PM CST Joe Stewart <jo...@be...> [B] - Comment.class - missing /form tag. |
|
From: Joe S. <joe...@us...> - 2002-01-08 21:44:03
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv16057
Modified Files:
article.php3
Log Message:
auto column sensing
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** article.php3 2002/01/08 21:38:23 1.54
--- article.php3 2002/01/08 21:43:57 1.55
***************
*** 92,96 ****
// $footer = getFooter();
! $titlebar = getTitlebar("100%", $title); // here if you need it.
$related = $story->getRelated($story_id);
--- 92,96 ----
// $footer = getFooter();
! // $titlebar = getTitlebar("100%", $title); // here if you need it.
$related = $story->getRelated($story_id);
***************
*** 142,146 ****
$t->set_var(array(
- TITLEBAR => $titlebar,
TITLE => $title,
BREADCRUMB => $breadcrumb,
--- 142,145 ----
***************
*** 151,159 ****
CENTER__TOP_BLOCK_COLUMN => $centertopblocks,
RIGHT_BLOCK_COLUMN => $rightblocks,
! HEADER => $header,
// EMAILFORM => $emailform,
// STORY => $story_html,
// ARROWS => $arrows,
! FOOTER => $footer,
// RELATED => $related,
));
--- 150,158 ----
CENTER__TOP_BLOCK_COLUMN => $centertopblocks,
RIGHT_BLOCK_COLUMN => $rightblocks,
! // HEADER => $header,
// EMAILFORM => $emailform,
// STORY => $story_html,
// ARROWS => $arrows,
! // FOOTER => $footer,
// RELATED => $related,
));
|
|
From: Joe S. <joe...@us...> - 2002-01-08 21:38:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv13990/phpslash-ft/public_html
Modified Files:
index.php3 article.php3
Log Message:
auto column sensing
Index: index.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** index.php3 2001/12/14 22:14:36 1.50
--- index.php3 2002/01/08 21:38:23 1.51
***************
*** 42,51 ****
$allstories = $story->getStories($ary);
! $allblocks = $block->getBlocks($ary);
$template = new Template($_PSL[templatedir]);
$template->debug = 0;
$template->set_file(array(
! index => "index.tpl"
));
--- 42,72 ----
$allstories = $story->getStories($ary);
! $leftblocks = $block->getBlocks($ary, "left");
! $centerblocks = $block->getBlocks($ary, "center");
! $rightblocks = $block->getBlocks($ary, "right");
+ if (empty($leftblocks)) {
+ if (empty($rightblocks)) {
+ // $centerblocks = $block->getBlocks($ary);
+ // $tplfile = "index1col.tpl";
+ // default to 2 column for transparent upgrade
+ $rightblocks = $block->getBlocks($ary);
+ $tplfile = "index2colright.tpl";
+ } else {
+ $tplfile = "index2colright.tpl";
+ $rightblocks = $related . $rightblocks;
+ }
+ } elseif (empty($rightblocks)) {
+ $tplfile = "index2colleft.tpl";
+ $leftblocks .= $related;
+ } else {
+ $tplfile = "index3col.tpl";
+ $rightblocks = $related . $rightblocks;
+ }
+
$template = new Template($_PSL[templatedir]);
$template->debug = 0;
$template->set_file(array(
! index => $tplfile //"index3col.tpl"
));
***************
*** 55,59 ****
BREADCRUMB => $breadcrumb,
STORY_COLUMN => $allstories,
! BLOCK_COLUMN => $allblocks
));
--- 76,82 ----
BREADCRUMB => $breadcrumb,
STORY_COLUMN => $allstories,
! LEFT_BLOCK_COLUMN => $leftblocks,
! CENTER_BLOCK_COLUMN => $centerblocks,
! RIGHT_BLOCK_COLUMN => $rightblocks
));
Index: article.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/article.php3,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** article.php3 2001/12/16 22:56:45 1.53
--- article.php3 2002/01/08 21:38:23 1.54
***************
*** 68,73 ****
XSITEOBJECT => $xsiteobject
));
! // $t->parse(PAGE, article);
! // $t->p(PAGE);
break;
--- 68,73 ----
XSITEOBJECT => $xsiteobject
));
! $t->parse(PAGE, article);
! $t->p(PAGE);
break;
***************
*** 89,120 ****
$_PSL['metatags']['description'] = substr(strip_tags($story->story_ary["intro_text"]), 0, 150);
! $header = getHeader($ttitle,$_PSL['metatags']);
! $footer = getFooter();
!
! // $titlebar = getTitlebar("100%", $title); // here if you need it.
! /* Display the story */
! // $arrows = $story->getNextPrev($story_id);
!
! $t->set_var(array(
! HEADER => $header,
! EMAILFORM => $emailform,
! TITLE => $title,
! STORY => $story_html,
! STORY_ID => $story_id,
! ARROWS => $arrows,
! IMAGEDIR => $_PSL[imageurl],
! FOOTER => $footer
! ));
!
! /* Now that related stuff */
! $fancy_boxes = $story->getRelated($story_id);
$block = new Block_i;
! $fancy_boxes .= $block->getBlocks($ary);
! $t->set_var(FANCY_BOXES, $fancy_boxes);
! /* Now the comments */
$cmtary[mode] = $mode;
--- 89,132 ----
$_PSL['metatags']['description'] = substr(strip_tags($story->story_ary["intro_text"]), 0, 150);
! // $header = getHeader($ttitle,$_PSL['metatags']);
! // $footer = getFooter();
!
! $titlebar = getTitlebar("100%", $title); // here if you need it.
! $related = $story->getRelated($story_id);
! $arrows = $story->getNextPrev($story_id);
$block = new Block_i;
! $leftblocks = $block->getBlocks($ary, "left" );
! $centerblocks = $block->getBlocks($ary, "center" );
! $rightblocks = $block->getBlocks($ary, "right" );
! if (empty($leftblocks)) {
! if (empty($rightblocks)) {
! // $centerblocks = $block->getBlocks($ary);
! // $centerblocks .= $related;
! // $tplfile = "index1col.tpl";
! // default to 2 column for transparent upgrade
! $rightblocks = $block->getBlocks($ary);
! $rightblocks .= $related;
! $tplfile = "index2colright.tpl";
! } else {
! $tplfile = "index2colright.tpl";
! $rightblocks = $related . $rightblocks;
! }
! } elseif (empty($rightblocks)) {
! $tplfile = "index2colleft.tpl";
! $leftblocks .= $related;
! } else {
! $tplfile = "index3col.tpl";
! $rightblocks = $related . $rightblocks;
! }
!
! $t->set_file(article, $tplfile); //"article.tpl");
!
! $related = $story->getRelated($story_id);
!
! /* Now the comments */
$cmtary[mode] = $mode;
***************
*** 126,131 ****
$t->set_var(COMMENTS, $comments);
-
$updatearticlehits = $_PSL["article_updatehits"];
if ($updatearticlehits) {
--- 138,163 ----
$t->set_var(COMMENTS, $comments);
+ /* Display the story */
+
+ $t->set_var(array(
+ TITLEBAR => $titlebar,
+ TITLE => $title,
+ BREADCRUMB => $breadcrumb,
+ STORY_ID => $story_id,
+ IMAGEDIR => $_PSL[imageurl],
+ STORY_COLUMN => $emailform."\n".$story_html."\n".$comments,
+ LEFT_BLOCK_COLUMN => $leftblocks,
+ CENTER__TOP_BLOCK_COLUMN => $centertopblocks,
+ RIGHT_BLOCK_COLUMN => $rightblocks,
+ HEADER => $header,
+ // EMAILFORM => $emailform,
+ // STORY => $story_html,
+ // ARROWS => $arrows,
+ FOOTER => $footer,
+ // RELATED => $related,
+ ));
+
+
$updatearticlehits = $_PSL["article_updatehits"];
if ($updatearticlehits) {
***************
*** 135,143 ****
$db->query($q);
}
} /* end of switch */
-
- $t->parse(PAGE, article);
- $t->p(PAGE);
} else {
--- 167,177 ----
$db->query($q);
}
+
+ slashhead($ttitle,$_PSL['metatags']);
+ $t->parse(PAGE, article);
+ $t->p(PAGE);
+ slashfoot();
} /* end of switch */
} else {
|
|
From: Joe S. <joe...@us...> - 2002-01-08 21:38:26
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv13990/phpslash-ft/public_html/templates/en/default
Modified Files:
index3col.tpl
Added Files:
index1col.tpl index2colleft.tpl index2colright.tpl
Log Message:
auto column sensing
--- NEW FILE: index1col.tpl ---
<!-- start index1col.tpl -->
{BREADCRUMB}
</td>
</tr>
<tr>
<td valign="TOP">
<table width="100%" cellpadding=0 cellspacing=0 border="0">
<tr>
<!-- Start of the main column -->
<td valign=top width="100%">
{CENTER_BLOCK_COLUMN}
{STORY_COLUMN}
</td>
<!-- End of the main column -->
</tr>
</table>
</td>
</tr>
<tr>
<td>
<!-- end index1col.tpl -->
--- NEW FILE: index2colleft.tpl ---
<!-- start index2colleft.tpl -->
{BREADCRUMB}
</td>
</tr>
<tr>
<td valign="top">
<table width="100%" cellpadding=0 cellspacing=0 border="0">
<tr>
<!-- This is the start of the left column -->
<td width="160" valign="top">
{LEFT_BLOCK_COLUMN}
</td>
<!-- this TD block is a spacer between the bar and blocks column -->
<td width="20" valign="TOP">
<img src="{IMAGEDIR}/layout/blank.gif" width="20" height="1">
</td>
<td valign="top">
<img src="{IMAGEDIR}/layout/blank.gif" width="1" height="1">
</td>
<!-- This is the start of the main column -->
<td valign=top width="100%">
{CENTER_BLOCK_COLUMN}
{STORY_COLUMN}
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<!-- end index2colleft.tpl -->
--- NEW FILE: index2colright.tpl ---
<!-- start index2colright.tpl -->
{BREADCRUMB}
</td>
</tr>
<tr>
<td>
<table width="100%" cellpadding=0 cellspacing=0 border="0">
<tr>
<!-- This is the start of the main column -->
<td valign=top width="100%">
{CENTER_BLOCK_COLUMN}
{STORY_COLUMN}
</td>
<!-- this TD block is a spacer -->
<td width="20" valign="TOP">
<img src="{IMAGEDIR}/layout/blank.gif" width="20" height="1">
</td>
<td valign="top">
<img src="{IMAGEDIR}/layout/blank.gif" width="1" height="1">
</td>
<!-- this TD block is the right blocks column -->
<td width="205" align=center valign="TOP">
{RIGHT_BLOCK_COLUMN}
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>
<!-- end index2colright.tpl -->
Index: index3col.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/index3col.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index3col.tpl 2001/11/28 17:49:56 1.2
--- index3col.tpl 2002/01/08 21:38:23 1.3
***************
*** 1,86 ****
!
! <!-- index.tpl -->
!
! <TABLE width="100%" cellpadding=0 cellspacing=0 border="0">
! <TR>
! <TD COLSPAN="3" VALIGN="TOP">
! {BREADCRUMB}
! </TD>
! </TR>
!
! <TR>
!
! <!-- This TD and TABLE are the start of the leftt column -->
!
! <TD WIDTH="170" ALIGN=CENTER VALIGN="TOP">
!
! <TABLE WIDTH="160" CELLPADDING="0" CELLSPACING="0" BORDER="0">
! <TR>
! <!-- this TD block is the blocks column -->
!
! <TD VALIGN="TOP">
! {LEFT_BLOCK_COLUMN}
! </TD>
! <!-- this TD block is a spacer between the bar and blocks column -->
!
! <TD VALIGN="TOP">
! <IMG SRC="{IMAGEDIR}/layout/blank.gif" WIDTH="5" HEIGHT="1" ALT="">
! </TD>
!
! <!-- this TD block right here is that grey bar between the stories and the left blocks -->
!
! <TD VALIGN="TOP" BGCOLOR="#cccccc">
! <IMG SRC="{IMAGEDIR}/layout/blank.gif" WIDTH="1" HEIGHT="1" ALT="">
! </TD>
!
! <!-- this TD block is a spacer between the bar and stories -->
!
! <TD VALIGN="TOP">
! <IMG SRC="{IMAGEDIR}/layout/blank.gif" WIDTH="5" HEIGHT="1" ALT="">
! </TD>
!
! </TR>
! </TABLE>
!
! </TD>
! <TD valign=top WIDTH="100%"><FONT color="#000000">
! {STORY_COLUMN}
! </TD>
! <!-- this TD block is a spacer between the story column and the grey bar. -->
! <TD WIDTH="20" VALIGN="TOP">
! <IMG SRC="{IMAGEDIR}/layout/blank.gif" WIDTH="20" HEIGHT="1">
! </TD>
! <!-- This TD and TABLE are the start of the right column -->
! <TD WIDTH="210" ALIGN=CENTER VALIGN="TOP">
! <TABLE WIDTH="200" CELLPADDING="0" CELLSPACING="0" BORDER="0">
! <TR>
! <!-- this TD block right here is that grey bar between the stories and the right column blocks -->
! <TD VALIGN="TOP" BGCOLOR="#cccccc">
! <IMG SRC="{IMAGEDIR}/layout/blank.gif" WIDTH="1" HEIGHT="1" ALT="">
! </TD>
! <!-- this TD block is a spacer between the bar and right blocks column -->
! <TD VALIGN="TOP">
! <IMG SRC="{IMAGEDIR}/layout/blank.gif" WIDTH="5" HEIGHT="1" ALT="">
! </TD>
!
! <!-- this TD block is the right blocks column -->
! <TD VALIGN="TOP">
! {RIGHT_BLOCK_COLUMN}
! </TD>
! </TR>
! </TABLE>
! </TD>
! </TR>
! </TABLE>
- <!-- end index.tpl -->
--- 1,53 ----
! <!-- start index3col.tpl -->
! {BREADCRUMB}
! </td>
! </tr>
! <tr>
! <td valign="top">
! <table width="100%" cellpadding=0 cellspacing=0 border="0">
! <tr>
! <!-- this TD block is the left blocks column -->
! <td width="160" valign="top">
! {LEFT_BLOCK_COLUMN}
! </td>
! <!-- this TD block is a spacer between the bar and blocks column -->
! <td width="20" valign="top">
! <img src="{IMAGEDIR}/layout/blank.gif" width="20" height="1">
! </td>
! <td valign="top">
! <img src="{IMAGEDIR}/layout/blank.gif" width="1" height="1">
! </td>
! <!-- this TD block is the main story blocks column -->
! <td valign=top width="100%">
! {CENTER_BLOCK_COLUMN}
! {STORY_COLUMN}
! </td>
! <!-- this TD block is a spacer between the story column right-hand column. -->
! <td width="20" valign="top">
! <img src="{IMAGEDIR}/layout/blank.gif" width="20" height="1">
! </td>
! <td valign="top">
! <img src="{IMAGEDIR}/layout/blank.gif" width="1" height="1">
! </td>
! <!-- This TD is the start of the right column -->
! <td width="205" align=center valign="top">
! {RIGHT_BLOCK_COLUMN}
! </td>
! </tr>
! </table>
! </td>
! </tr>
! <tr>
! <td>
! <!-- end index3col.tpl -->
|
|
From: Joe S. <joe...@us...> - 2002-01-08 21:38:26
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv13990/phpslash-ft/class
Modified Files:
Comment.class Block.class Block_i.class
Log Message:
auto column sensing
Index: Comment.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Comment.class,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Comment.class 2001/11/14 18:07:23 1.21
--- Comment.class 2002/01/08 21:38:23 1.22
***************
*** 294,298 ****
<input type=submit name=action value=\"".pslgetText("Bulk Delete")."\">
<input type=submit name=action value=\"".pslgetText("Show Pending")."\">
! <input type=hidden name=story_id value=$cmtary[story_id]>";
} else {
$admin = "";
--- 294,298 ----
<input type=submit name=action value=\"".pslgetText("Bulk Delete")."\">
<input type=submit name=action value=\"".pslgetText("Show Pending")."\">
! <input type=hidden name=story_id value=$cmtary[story_id]></form>";
} else {
$admin = "";
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Block.class 2002/01/07 17:21:32 1.7
--- Block.class 2002/01/08 21:38:23 1.8
***************
*** 303,307 ****
function doBlock($id, $column="") {
! $width = "210";
if ($id != $this->block_info["id"]) {
--- 303,307 ----
function doBlock($id, $column="") {
! $width = "100%";
if ($id != $this->block_info["id"]) {
Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Block_i.class 2001/11/07 21:35:11 1.9
--- Block_i.class 2002/01/08 21:38:23 1.10
***************
*** 258,262 ****
FROM psl_block block,
psl_block_type type
! WHERE type.id = block.type";
$this->db->query($query);
--- 258,263 ----
FROM psl_block block,
psl_block_type type
! WHERE type.id = block.type
! ORDER BY title ";
$this->db->query($query);
***************
*** 351,355 ****
function parseBlock($ary, $column="") {
! $width = "210";
if ( ($ary[block_options][column] == $column) OR
--- 352,356 ----
function parseBlock($ary, $column="") {
! $width = "100%";
if ( ($ary[block_options][column] == $column) OR
|
|
From: Joe S. <joe...@us...> - 2002-01-08 21:38:26
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv13990/phpslash-ft Modified Files: CHANGES Log Message: auto column sensing Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.365 retrieving revision 1.366 diff -C2 -d -r1.365 -r1.366 *** CHANGES 2002/01/07 17:21:32 1.365 --- CHANGES 2002/01/08 21:38:23 1.366 *************** *** 13,16 **** --- 13,24 ---- 9 - Removal of something (kill -9 :) + 2002-Jan-08 3:30PM CST Joe Stewart <jo...@be...> + [B] - Comment.class - missing /form tag. + - Block.class, Block_i.class - changed default block width to "100%". + [F] - index.php3, article.php3 - added column sensing code. + [T] - index1col.tpl, index2colleft.tpl, index2colright.tpl, index3col.tpl + added or changed. + All the above changes are thanks to Peter Cruikshank. + 2002-Jan-07 11:20AM CST Joe Stewart <jo...@be...> [B] - Block.class::putBlock should now force an update of the block contents. |
|
From: Joe S. <joe...@us...> - 2002-01-07 17:21:35
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv24718/phpslash-ft Modified Files: CHANGES Log Message: putBlock tweak Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.364 retrieving revision 1.365 diff -C2 -d -r1.364 -r1.365 *** CHANGES 2002/01/07 15:44:20 1.364 --- CHANGES 2002/01/07 17:21:32 1.365 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-Jan-07 11:20AM CST Joe Stewart <jo...@be...> + [B] - Block.class::putBlock should now force an update of the block contents. + 2002-Jan-07 9:45AM CST Joe Stewart <jo...@be...> [B] - Mailinglist.class - pslgetText typos. |
|
From: Joe S. <joe...@us...> - 2002-01-07 17:21:35
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv24718/phpslash-ft/class
Modified Files:
Block.class
Log Message:
putBlock tweak
Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block.class 2001/11/07 21:34:59 1.6
--- Block.class 2002/01/07 17:21:32 1.7
***************
*** 192,195 ****
--- 192,196 ----
type = '$block_array[block_type]',
expire_length = '$block_array[expire_length]',
+ last_update = '',
title = '$block_array[block_title]',
location = '$block_array[location]',
|
|
From: Joe S. <joe...@us...> - 2002-01-07 15:55:33
|
Update of /cvsroot/phpslash/phpslash-ft/class/locale
In directory usw-pr-cvs1:/tmp/cvs-serv27896/phpslash-ft/class/locale
Added Files:
nl.php3
Log Message:
pslgetText typo
--- NEW FILE: nl.php3 ---
<?php
/*
* Nederlands (Dutch) Language file for PHPSlash
* translations named using POSIX locale conventions ( en, es, de, etc)
*
* Please don't use HTML code here!
*/
$pslstrings = array(
// about.php3
// article.php3
// backend.php3
// comment.php3
"No Subject Given" =>
"",
"Re: " =>
"Re: ",
"Anonymous" =>
"Anoniem",
"Comments" =>
"Commentaar",
"You didn't supply a good submit value" =>
"Je hebt geen goede waarde ingegeven",
// commentShow.php3
// commentSubmit.php3
// config.php3
"Home" =>
"Start",
"Add Story" =>
"Nieuw artikel",
"Archives" =>
"Zoek",
"Polls" =>
"Enquetes",
"About" =>
"Over mijzelf",
"Topic" =>
"Onderwerp",
"Story" =>
"Artikel",
"Submission" =>
"Artikel",
"Section" =>
"Sectie",
"Block" =>
"Blok",
"Poll" =>
"Enquete",
"Author" =>
"Auteur",
"Glossary" =>
"Woordenlijst",
"Mailing List" =>
"Mailing List",
"Variable" =>
"Variabele",
"Logging" =>
"Logging",
// functions.inc
"NO TITLE" =>
"GEEN TITEL",
"@!#$" =>
"@!#$",
// glossary.php3
// index.php3
// indextpl3col.php3
// login.php3
"%s logged out." =>
"%s is uitgelogd.",
// mailinglist.php3
// poll.php3
"VOTE: " =>
"STEM: ",
"View Pollbooth" =>
"Bekijk enquetes",
"%s Poll" =>
"%s Enquete",
// pollBooth.php3
// search.php3
"Searching %s" =>
"Zoek %s",
"All Topics" =>
"Alle onderwerpen",
"All Sections" =>
"Alle secties",
"All Authors" =>
"Alle Auteurs",
// submisson.php3
"Thanks for this submission. We have it and will set our fearless editorial staff upon it right this second." =>
"Bedankt voor je bijdrage. Het wordt zo spoedig mogelijk verwerkt.",
"Something broke, I'm not sure what though??" =>
"Hmm... Iets ging er mis, maar ik ben niet zeker wat precies",
"New Submission" =>
"Nieuw artikel",
// submissionAdmin.php3
// /admin files
// authorAdmin
"Error! Invalid Privileges" =>
"Fout! Verkeerde privileges",
"Sorry. You do not have the necessary privilege to view this page." =>
"Sorry. Je bent niet geautoriseerd om deze pagina te bekijken.",
// blockadmin.php3
// commentAdmin.php3
// glossaryAdmin.php3
// infologAdmin.php3
// mailinglistAdmin.php3
// pollAdmin.php3
// sectionAdmin.php3
// storyAdmin.php
// submissionAdmin.php3
// topicAdmin.php3
// variableAdmin.php3
// /class files
// Author.class
// Block.class
// Block_i.class
// Block_render_cal.class
"January" =>
"Januari",
"February" =>
"Februari",
"March" =>
"Maart",
"April" =>
"April",
"May" =>
"Mei",
"June" =>
"Juni",
"July" =>
"Juli",
"August" =>
"Augustus",
"September" =>
"September",
"October" =>
"Oktober",
"November" =>
"November",
"December" =>
"December",
// Block_render_html.class
// Block_render_poll.class
// Block_render_query.class
// Block_render_quote.class
// Block_render_rss.class
// Block_render_section.class
// Block_render_topic.class
// Block_render_url.class
// Comment.class
"Nested" =>
"Genest",
"Threaded" =>
"Threaded",
"Flat" =>
"Plat",
"Index" =>
"Index",
"Bulk Delete" =>
"Bulk Delete",
"Show Pending" =>
"Bekijk hangende artikelen",
// Glossary.class
"Add a new Term" =>
"Voeg een nieuw woord toe",
// Infolog.class
// Mailinglist.class
"Email Headline Updates" =>
"Email Headlines",
"You need to enter an email address" =>
"Je moet een geldig email adres opgeven",
"There was an error inserting your subscription information into the database." =>
"Er is een fout opgetreden toen je abonnee informatie naar de database werd geschreven.",
"There was an error inserting your frequency data." =>
"Er is een fout opgetreden toen de frequentie data werd opgeslagen.",
"Thank you. You will receive a confirmation email soon to verify your subscription." =>
"Dank je, binnen enkele momenten zul je een bevestigings-email krijgen om je gegevens te verifieren.",
"You have been successfully subscribed, but there was a problem sending your confirmation email. You should, however receive your newsletter soon." =>
"Je bent aangemeld, maar er is een fout opgetreden bij je bevestigings-email. Echter, binnenkort zul je de eerste nieuwsbrief krijgen.",
"The email address '%s' is not found" =>
"Het email adres %s is niet geldig",
"Email: '%s' is not found" =>
"Email: '%s' is niet geldig",
"Email: '%s' has been removed" =>
"Email: '%s' is verwijderd",
"Thank you. for your subscription to our site. If there is anything we can do to improve our service, please let us know!" =>
"Bedankt voor je aanmelding!",
"You've been removed from the mailing list, but there was a problem sending out the final email." =>
"Je bent verwijderd van de mailing list, er was echter wel nog een probleem met het verzenden van de laatste mail.",
"Unsubscribing all Mailing List Members" =>
"Afmelden van alle mailing list abonnees",
"Now ignoring abort calls..." =>
"Negeer abort calls...",
"Sending mail to the following users:" =>
"Verzenden van email naar de volgende gebruikers:",
"Mail Sent Successfully!" =>
"Mail verzonden!",
"Error Sending Email!" =>
"Fout tijdens verzenden van de email!",
"You didn't give a email subject! Halting." =>
"Je hebt geen email onderwerp gegeven. Ik stop even.",
// Navbar.class
"Login" =>
"Login",
"Logout %s" =>
"Logout %s",
// Poll.class
"Your vote has been registered" =>
"Je stem is geregistreerd",
"Your vote hasn't been registered because there was no remote address: %s" =>
"Je stem is niet geregistreerd omdat er geen adres was: %s",
"Your vote hasn't been registered because you (or someone from your computer) has already voted." =>
"Je stem is niet geregistreerd omdat jij (of iemand anders op deze computer) al eens gestemd heeft.",
// Section.class
// Story.class
"More" =>
"Meer",
"Related Links" =>
"Gerelateerde links",
"Reply" =>
"Discussieren",
"Also filed under" =>
"Ook geplaatst onder",
"comments" =>
"commentaren",
"comment" =>
"commentaar",
"Comments?" =>
"Commentaar?",
// Submission.class
"Anonymous Coward" =>
"Anonieme lafaard"
// Topic.class
// TopicBar.class
// Variable.class
);
?>
|
2 messages has been excluded from this view by a project administrator.
