phpslash-commit Mailing List for phpSlash (Page 81)
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
phpslash-commit — A list for automatically mailed SCM Commits
You can subscribe to this list here.
| 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-07-09 20:35:00
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.7
In directory usw-pr-cvs1:/tmp/cvs-serv12793/phpslash-ft/tables/0.7
Modified Files:
65_to_7.sql slash-all.sql
Log Message:
expanded block title length
Index: 65_to_7.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/65_to_7.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** 65_to_7.sql 14 Jun 2002 20:25:32 -0000 1.6
--- 65_to_7.sql 9 Jul 2002 20:34:56 -0000 1.7
***************
*** 2,5 ****
--- 2,7 ----
ALTER TABLE psl_section ADD section_options TEXT;
ALTER TABLE psl_author ADD author_options TEXT;
+ ALTER TABLE psl_block CHANGE `title` `title` VARCHAR(255) NOT NULL;
+
INSERT INTO db_sequence VALUES ('psl_permission_seq',80);
INSERT INTO db_sequence VALUES ('psl_group_seq',27);
Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/slash-all.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** slash-all.sql 30 Jun 2002 14:13:59 -0000 1.8
--- slash-all.sql 9 Jul 2002 20:34:56 -0000 1.9
***************
*** 192,196 ****
id int(11) unsigned DEFAULT '0' NOT NULL,
type int(11) DEFAULT '0' NOT NULL,
! title varchar(30) NOT NULL,
expire_length int(11) DEFAULT '0' NOT NULL,
last_update timestamp(14),
--- 192,196 ----
id int(11) unsigned DEFAULT '0' NOT NULL,
type int(11) DEFAULT '0' NOT NULL,
! title varchar(255) NOT NULL,
expire_length int(11) DEFAULT '0' NOT NULL,
last_update timestamp(14),
|
|
From: Joe S. <joe...@us...> - 2002-07-09 19:48:50
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv30263/phpslash-ft/class
Modified Files:
Author.class Block_render_cal.class Block_render_login.class
Log Message:
typo bugfixes
Index: Author.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Author.class,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Author.class 3 Jun 2002 18:04:55 -0000 1.26
--- Author.class 9 Jul 2002 19:48:46 -0000 1.27
***************
*** 1,705 ****
! <?php
!
! /* $Id$ */
!
! /**
! * Provides an API to the PHPSlash Author Management.
! *
! * This object is how we do anything with authors.
! *
! * optional configuration variables:
[...1384 lines suppressed...]
! $mail_ary['mail_to'] = $this->db->Record['author_realname'];
! $mail_ary['mail_to_address'] = $this->db->Record['email'];
! $mail_ary['vars']['confirm'] = $confirm_hash;
! $mail_ary['vars']['remote_addr'] = $REMOTE_ADDR;
!
! if(emailNotify($mail_ary)) {
! $this->message = "Email Confirmation sent";
! $success = true;
! } else {
! $this->message = "Email Confirmation failure";
! $success = false;
! }
! }
!
! return $success;
! }
!
!
! } /* end of Author.class */
! ?>
Index: Block_render_cal.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_cal.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Block_render_cal.class 27 Apr 2002 21:58:17 -0000 1.6
--- Block_render_cal.class 9 Jul 2002 19:48:46 -0000 1.7
***************
*** 97,101 ****
// the Home section then everything that looks at a page
// will end up having bum links
! 'URL' => $this->psl['rooturl'] . "?date=$url_date" . $url_day,
'LINKED_DATA' => "$daycounter"
));
--- 97,101 ----
// the Home section then everything that looks at a page
// will end up having bum links
! 'URL' => $this->psl['rooturl'] . "/?date=$url_date" . $url_day,
'LINKED_DATA' => "$daycounter"
));
Index: Block_render_login.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_login.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_render_login.class 20 May 2002 17:52:47 -0000 1.1
--- Block_render_login.class 9 Jul 2002 19:48:46 -0000 1.2
***************
*** 2,6 ****
/* Block_render_login.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
class Block_render_login {
--- 2,6 ----
/* Block_render_login.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
class Block_render_login {
|
|
From: Joe S. <joe...@us...> - 2002-07-09 19:48:49
|
Update of /cvsroot/phpslash/phpslash-ft
In directory usw-pr-cvs1:/tmp/cvs-serv30263/phpslash-ft
Modified Files:
CHANGES
Log Message:
typo bugfixes
Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v
retrieving revision 1.536
retrieving revision 1.537
diff -C2 -d -r1.536 -r1.537
*** CHANGES 9 Jul 2002 18:14:24 -0000 1.536
--- CHANGES 9 Jul 2002 19:48:46 -0000 1.537
***************
*** 14,17 ****
--- 14,23 ----
2002-July-09 1:00PM CDT Joe Stewart <joe...@us...>
+ [B] - Author.class - [ 577877 ] Author.class - misplaced bracket - krabu.
+ [B] - Block_render_cal.class - [ 578221 ] Minor typo in _render_cal - krabu.
+ [B] - Block_render_login.class - [ 578223 ] Typos in _render_login and _section
+ - krabu.
+
+ 2002-July-09 1:00PM CDT Joe Stewart <joe...@us...>
[W] - Block_render_section.class - Peter's comment update patch -
[ 578080 ] block_render_section phpDoc comments.
|
|
From: Joe S. <joe...@us...> - 2002-07-09 18:14:28
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv3846/phpslash-ft/class
Modified Files:
Block_render_section.class
Log Message:
[ 578080 ] block_render_section phpDoc comments
Index: Block_render_section.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_render_section.class,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Block_render_section.class 27 Apr 2002 20:31:10 -0000 1.9
--- Block_render_section.class 9 Jul 2002 18:14:25 -0000 1.10
***************
*** 1,136 ****
! <?php
!
! /* Block_render_section.class -> Methods for phpslash specfic blocks */
! /* Id:$ */
!
! /* pass the query in the "Source Url" form field in the format of:
! *
! * option1=setting1&option2=setting2
! *
! * Available query options:
! *
! * mode = all [] show all sections ( even those with no stories)
! * section_id = limit returned data to this section_id
! * section = limit returned data to this section
! * tpl = template filename [sectionsblock] (no path or extension)
! */
!
!
! class Block_render_section {
!
! var $type;
! var $output;
! var $psl;
!
! /* constructor */
! function Block_render_section() {
! global $_PSL;
!
! $this->type = "section"; /* set the 'type' */
! $this->output = ""; /* clear the output */
! $this->psl = $_PSL;
!
! }
!
! /* returns the TYPE of this class */
! function getType() {
! return $this->type;
! }
!
! function parse( $block_info) {
!
! $this->output = $this->sections( $block_info);
! return 1;
! }
!
! function sections( $block_info) {
!
! $db = new slashDB;
!
! $default_tpl = "sectionsblock.tpl";
! if( $this->psl['site_homesection'] == false) {
! $site_homesection = "Home";
! }
!
! $link_prefix = "?section_id=";
!
! $options = $block_info["source_url"];
!
! parse_str( $options);
!
!
! // $tpl = ""; // disable template option
! if( empty($tpl) ) {
! $tpl = $default_tpl;
! } elseif ( file_exists($this->psl['templatedir'] . "/" . basename($tpl) . ".tpl") ) {
! $tpl = basename($tpl) . ".tpl";
! } else {
! debug ( "Block_render_section:Template file doesn't exist, using default instead", $tpl);
! $tpl = $default_tpl;
! }
!
! $template = new Template($this->psl['templatedir']);
! $template->debug = 0;
! $template->set_file(array(
! 'block' => "$tpl"
! ));
! $template->set_block ("block", "each_section", "section_block");
! $template->set_var (array (
! 'SECTION_VALUE' => "",
! 'SECTION_TEXT' => ""
! ));
!
!
! $q = "SELECT DISTINCT psl_section.section_id,
! psl_section.section_name,
! psl_section.description
! FROM psl_section ";
! /* "all" will show sections that don't have any stories */
! if ( $mode != "all") {
! $q .= ", psl_section_lut
! WHERE psl_section.section_id = psl_section_lut.section_id ";
! if ( $section_id) {
! $q .= " AND psl_section.section_id = '$section_id' ";
! } elseif( $section) {
! $q .= " AND psl_section.section_name = '$section' ";
! }
!
! }
!
! $q .= " ORDER BY section_name";
!
! $db->query($q);
!
! while ($db->next_record()) {
!
! if ( $db->Record['section_name'] == $site_homesection) {
! $section_link = "";
! } else {
! $section_link = $link_prefix . $db->Record['section_id'];
! }
!
! $template->set_var (array (
! 'SECTION_LINK' => $section_link,
! 'SECTION_NAME' => $db->Record['section_name'],
! 'DESCRIPTION' => $db->Record['description']
! ));
! $template->parse ("section_block", "each_section", true);
! }
!
! $template->set_var(array(
! 'ROOTDIR' => $this->psl['rooturl'],
! 'IMAGEDIR' => $this->psl['imageurl']
! ));
!
! unset($db);
! return $template->parse('OUT',"block");
!
! }
!
! function getFinal() {
! return $this->output;
! }
!
! }
!
! ?>
--- 1,167 ----
! <?php
!
! /* Block_render_section.class -> Methods for phpslash specfic blocks */
! /* $Id$ */
!
! /**
! * Creates a block that lists all sections (with stories)
! *
! * pass the query in the "Source Url" form field in the format of:
! *
! * option1=setting1&option2=setting2
! *
! * Available query options:
! *
! * mode = all [] show all sections ( even those with no stories)
! * section_id = limit returned data to this section_id
! * section = limit returned data to this section
! * tpl = template filename [sectionsblock] (no path or extension)
! */
!
!
! class Block_render_section {
!
! /*
! * private variables
! */
! var $type;
! var $output;
! var $psl;
!
! /**
! * constructor
! */
! function Block_render_section() {
! global $_PSL;
!
! $this->type = 'section'; /* set the 'type' */
! $this->output = ''; /* clear the output */
! $this->psl = $_PSL;
!
! }
!
! /**
! * returns the TYPE of this class
! *@return string
! *@access public
! */
! function getType() {
! return $this->type;
! }
!
! /**
! * Creates the html and saves it in $this->output
! *@param array $block_info
! *@return bool
! *@access public
! */
! function parse( $block_info) {
! $this->output = $this->sections( $block_info);
! return 1;
! }
!
! /**
! * Creates the html
! *@param array $block_info $block_info[source_url] contains display options
! @see class comments for values for $block_info[source_url]
! *@return htmlstring
! *@access private
! */
! function sections( $block_info) {
!
! $db = new slashDB;
!
! $default_tpl = "sectionsblock.tpl";
! if( $this->psl['site_homesection'] == false) {
! $site_homesection = 'Home';
! }
!
! $link_prefix = '?section_id=';
!
! $options = $block_info['source_url'];
!
! parse_str( $options);
!
!
! // $tpl = ""; // disable template option
! if( empty($tpl) ) {
! $tpl = $default_tpl;
! } elseif ( file_exists($this->psl['templatedir'] . "/" . basename($tpl) . ".tpl") ) {
! $tpl = basename($tpl) . ".tpl";
! } else {
! debug ( "Block_render_section:Template file doesn't exist, using default instead", $tpl);
! $tpl = $default_tpl;
! }
!
! $template = new Template($this->psl['templatedir']);
! $template->debug = 0;
! $template->set_file(array(
! 'block' => "$tpl"
! ));
! $template->set_block ("block", "each_section", "section_block");
! $template->set_var (array (
! 'SECTION_VALUE' => "",
! 'SECTION_TEXT' => ""
! ));
!
!
! $q = "SELECT DISTINCT psl_section.section_id,
! psl_section.section_name,
! psl_section.description
! FROM psl_section ";
! /* "all" will show sections that don't have any stories */
! if ( $mode != "all") {
! $q .= ", psl_section_lut
! WHERE psl_section.section_id = psl_section_lut.section_id ";
! if ( $section_id) {
! $q .= " AND psl_section.section_id = '$section_id' ";
! } elseif( $section) {
! $q .= " AND psl_section.section_name = '$section' ";
! }
! }
!
! $q .= " ORDER BY section_name";
!
! $db->query($q);
!
! while ($db->next_record()) {
!
! if ( $db->Record['section_name'] == $site_homesection) {
! $section_link = "";
! } else {
! $section_link = $link_prefix . $db->Record['section_id'];
! }
!
! $template->set_var (array (
! 'SECTION_LINK' => $section_link,
! 'SECTION_NAME' => $db->Record['section_name'],
! 'DESCRIPTION' => $db->Record['description']
! ));
! $template->parse ("section_block", "each_section", true);
! }
!
! $template->set_var(array(
! 'ROOTDIR' => $this->psl['rooturl'],
! 'IMAGEDIR' => $this->psl['imageurl']
! ));
!
! unset($db);
! return $template->parse('OUT',"block");
!
! }
!
! /**
! * Returns the html for display
! *
! * Requires that parse() has already been called.
! *
! *@return htmlstring
! *@access public
! */
! function getFinal() {
! return $this->output;
! }
!
! }
!
! ?>
|
|
From: Joe S. <joe...@us...> - 2002-07-09 18:14:28
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv3846/phpslash-ft Modified Files: CHANGES Log Message: [ 578080 ] block_render_section phpDoc comments Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.535 retrieving revision 1.536 diff -C2 -d -r1.535 -r1.536 *** CHANGES 30 Jun 2002 14:13:58 -0000 1.535 --- CHANGES 9 Jul 2002 18:14:24 -0000 1.536 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-July-09 1:00PM CDT Joe Stewart <joe...@us...> + [W] - Block_render_section.class - Peter's comment update patch - + [ 578080 ] block_render_section phpDoc comments. + [W] - config.php3 - close off modifiers to paragraph tags in comments. + 2002-June-30 9:30AM CDT Joe Stewart <joe...@us...> [WSTD] - config.php3, slash-all.sql, navbarBlock.tpl, navbarBlockh.tpl, |
|
From: Joe S. <joe...@us...> - 2002-07-09 18:14:28
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv3846/phpslash-ft/public_html
Modified Files:
config.php3
Log Message:
[ 578080 ] block_render_section phpDoc comments
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** config.php3 30 Jun 2002 14:13:59 -0000 1.145
--- config.php3 9 Jul 2002 18:14:25 -0000 1.146
***************
*** 505,509 ****
*/
$_PSL['approvedtags'] = array(
! "p"=>2,
"b"=>1,
"i"=>1,
--- 505,509 ----
*/
$_PSL['approvedtags'] = array(
! "p"=>1,
"b"=>1,
"i"=>1,
|
|
From: Joe S. <joe...@us...> - 2002-06-30 14:16:04
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv15957/basic
Modified Files:
navbarBlock.tpl
Added Files:
navbarBlockh.tpl
Log Message:
admin navbar block
--- NEW FILE: navbarBlockh.tpl ---
<!-- START: navbarBlock.tpl -->
<!-- BEGIN each_destination -->
<a href="{LINK_NAVBAR}"><b>{LINK_NAVBAR_TEXT}</b></a>
<!-- END each_destination -->
<!-- END: navbarBlock.tpl -->
Index: navbarBlock.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/navbarBlock.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** navbarBlock.tpl 20 May 2002 16:07:31 -0000 1.1
--- navbarBlock.tpl 30 Jun 2002 14:16:01 -0000 1.2
***************
*** 1,5 ****
<!-- START: navbarBlock.tpl -->
<!-- BEGIN each_destination -->
! <a href="{LINK_NAVBAR}"><b>{LINK_NAVBAR_TEXT}</b></a>
<!-- END each_destination -->
<!-- END: navbarBlock.tpl -->
--- 1,5 ----
<!-- START: navbarBlock.tpl -->
<!-- BEGIN each_destination -->
! <br /> <a href="{LINK_NAVBAR}"><b>{LINK_NAVBAR_TEXT}</b></a>
<!-- END each_destination -->
<!-- END: navbarBlock.tpl -->
|
|
From: Joe S. <joe...@us...> - 2002-06-30 14:16:04
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv15957/default
Added Files:
navbarBlockh.tpl
Log Message:
admin navbar block
--- NEW FILE: navbarBlockh.tpl ---
<!-- START: navbarBlock.tpl -->
<!-- BEGIN each_destination -->
 <a href="{LINK_NAVBAR}"><b><font size="-1" face="Verdana,Arial,Helvetica,San-Serif">{LINK_NAVBAR_TEXT}</b></a>
<!-- END each_destination -->
<!-- END: navbarBlock.tpl -->
|
|
From: Joe S. <joe...@us...> - 2002-06-30 14:14:02
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv14953/phpslash-ft Modified Files: CHANGES Log Message: admin navbar block Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.534 retrieving revision 1.535 diff -C2 -d -r1.534 -r1.535 *** CHANGES 25 Jun 2002 22:51:20 -0000 1.534 --- CHANGES 30 Jun 2002 14:13:58 -0000 1.535 *************** *** 13,16 **** --- 13,21 ---- 9 - Removal of something (kill -9 :) + 2002-June-30 9:30AM CDT Joe Stewart <joe...@us...> + [WSTD] - config.php3, slash-all.sql, navbarBlock.tpl, navbarBlockh.tpl, + framedbox.tpl, phpslash.sgml - split admin navbar items into + separate menu. Set default skin to basic. + 2002-June-25 5:30PM CDT Joe Stewart <joe...@us...> [B] - poll.php3 - correct commit from Mon Jun 17 16:54:51 2002 UTC. |
|
From: Joe S. <joe...@us...> - 2002-06-30 14:14:02
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv14953/phpslash-ft/public_html/templates/en/default
Modified Files:
framedbox.tpl
Log Message:
admin navbar block
Index: framedbox.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/framedbox.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** framedbox.tpl 20 May 2002 17:52:47 -0000 1.1
--- framedbox.tpl 30 Jun 2002 14:13:59 -0000 1.2
***************
*** 1,4 ****
<!-- START FRAMEDBOX.TPL: {TITLE} -->
! <table border="1" width="100%" cellspacing="0" cellpadding="0" bordercolor="#3F4469" bordercolordark="#3F4469" bordercolorlight="#3F4469">
<tr>
<td width="100%">
--- 1,5 ----
<!-- START FRAMEDBOX.TPL: {TITLE} -->
! <IMG SRC="{IMAGEDIR}/layout/blank.gif" HEIGHT="1" WIDTH="1" ALT="">
! <table border="1" width="{WIDTH}" cellspacing="0" cellpadding="0" bordercolor="#3F4469" bordercolordark="#3F4469" bordercolorlight="#3F4469">
<tr>
<td width="100%">
|
|
From: Joe S. <joe...@us...> - 2002-06-30 14:14:02
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv14953/phpslash-ft/public_html
Modified Files:
config.php3
Log Message:
admin navbar block
Index: config.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/config.php3,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** config.php3 3 Jun 2002 18:19:40 -0000 1.144
--- config.php3 30 Jun 2002 14:13:59 -0000 1.145
***************
*** 223,228 ****
$_PSL['templatedir'] = setLangTpl($lang);
! // Sets the default dkin for a site
! $_PSL['defaultskin'] = "default";
// comment out this block to disable setting theme in url
--- 223,228 ----
$_PSL['templatedir'] = setLangTpl($lang);
! // Sets the default skin for a site
! $_PSL['defaultskin'] = "basic"; // no css skin - "default"
// comment out this block to disable setting theme in url
***************
*** 299,302 ****
--- 299,308 ----
);
+
+ $_PSL['menuitem'] = $menuitem; // add default menuitems to global array
+
+ $menuitem = array();
+
+
$menuitem[] = array(
'name' => "User Profile",
***************
*** 379,383 ****
);
! $_PSL['menuitem'] = $menuitem; // add default menuitems to global array
// end of NavBar Menu Definitions
--- 385,391 ----
);
! $_PSL['menuadmin'] = $menuitem; // add default menuitems to global array
!
! // $_PSL['menuitem'] = $_PSL['menuitem']+$_PSL['menuadmin']; //uncomment to restor old navbar
// end of NavBar Menu Definitions
|
|
From: Joe S. <joe...@us...> - 2002-06-30 14:14:02
|
Update of /cvsroot/phpslash/phpslash-ft/tables/0.7
In directory usw-pr-cvs1:/tmp/cvs-serv14953/phpslash-ft/tables/0.7
Modified Files:
slash-all.sql
Log Message:
admin navbar block
Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/tables/0.7/slash-all.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** slash-all.sql 20 Jun 2002 23:48:37 -0000 1.7
--- slash-all.sql 30 Jun 2002 14:13:59 -0000 1.8
***************
*** 381,386 ****
', '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', '14400', '20011002152749', '', '', '', 'a:3:{s:6:"column";s:4:"left";s:5:"perms";s:4:"user";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:3:{s:6:"column";s:6:"center";s:5:"perms";s:4:"user";s:0:"";s:0:"";}', '90');
!
# --------------------------------------------------------
#
--- 381,386 ----
', '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', '14400', '20011002152749', '', '', '', 'a:3:{s:6:"column";s:4:"left";s:5:"perms";s:4:"user";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( '148', '1', 'Administration', '0', '20020628131644', '', '', '<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:3:{s:6:\"column\";s:6:\"center\";s:5:\"perms\";s:4:\"user\";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( '149', '12', 'Tasks', '0', '20020628131658', '', 'menu_ary=menuadmin&tpl=navbarBlockh', '', 'a:4:{s:6:\"column\";s:6:\"center\";s:5:\"width\";s:4:\"100%\";s:5:\"perms\";s:4:\"user\";s:8:\"box_type\";s:6:\"framed\";}', '95');
# --------------------------------------------------------
#
***************
*** 410,413 ****
--- 410,416 ----
INSERT INTO psl_block_type (id, name) VALUES ( '9', 'quote');
INSERT INTO psl_block_type (id, name) VALUES ( '10', 'skin');
+ INSERT INTO psl_block_type (id, name) VALUES( '11', 'login');
+ INSERT INTO psl_block_type (id, name) VALUES( '12', 'navbar');
+ INSERT INTO psl_block_type (id, name) VALUES( '13', 'submission');
# --------------------------------------------------------
#
***************
*** 1000,1004 ****
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');
!
--- 1003,1008 ----
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');
! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES( '320', '149', '8');
! INSERT INTO psl_section_block_lut (lut_id, block_id, section_id) VALUES( '319', '149', '9');
|
|
From: Joe S. <joe...@us...> - 2002-06-30 14:14:02
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv14953/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
admin navbar block
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** phpslash.sgml 24 Jun 2002 19:57:02 -0000 1.49
--- phpslash.sgml 30 Jun 2002 14:13:59 -0000 1.50
***************
*** 786,789 ****
--- 786,790 ----
mailinglistAdmin.tpl
navbarBlock.tpl
+ navbarBlockh.tpl
pollList.tpl
pollResultPage.tpl
|
|
From: Joe S. <joe...@us...> - 2002-06-25 22:51:23
|
Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv10563/phpslash-ft/public_html
Modified Files:
poll.php3
Log Message:
correct commit for poll.php3
Index: poll.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/poll.php3,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** poll.php3 17 Jun 2002 16:54:51 -0000 1.13
--- poll.php3 25 Jun 2002 22:51:20 -0000 1.14
***************
*** 3,73 ****
/* $Id$ */
! $pagetitle = "Poll 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"));
! /*****************************
! START OF PAGE
! *****************************/
! $auth->login_if(!$perm->have_perm('pollList'));
! /* DEBUG STUFF */
! // debug("HTTP_POST_VARS" , $HTTP_POST_VARS);
! // debug("HTTP_GET_VARS" , $HTTP_GET_VARS);
! /* END DEBUG STUFF */
$poll = new Poll;
! $content = '';
! switch ($submit) {
! case "edit":
! if ($perm->have_perm("pollEdit")) {
! $content .= $poll->editPoll($question_id);
}
break;
! case "new":
! if ($perm->have_perm("pollNew")) {
! $content .= $poll->newPoll();
! }
break;
! case "save":
! if ($perm->have_perm("pollPut")) {
! if ($poll->savePoll($HTTP_POST_VARS)) {
! $content .= "<center>";
! $content .= getFancybox(210, $_PSL['site_name'] ."Poll", $poll->getPollBooth($HTTP_POST_VARS['question_id']), "r");
! $content .= "</center>";
! } else {
! $content .= getError($poll->message);
! }
! }
break;
! case "delete":
! $content .= getTitlebar ("100%", "Deleting poll");
! if($poll->deletePoll($question_id)) {
! $content .= getMessage($poll->message);
} else {
! $content .= getError($poll->message);
! }
! case "makecurrent":
! if(!$poll->makeCurrent($question_id)) {
! $content .= getError($poll->message);
}
- default:
- if ($perm->have_perm("pollList")) {
- $content .= $poll->listPolls($min);
- }
- }
-
- if($content == '') {
- $content = getTitlebar("100%","Error! Invalid Privileges");
- $content .= "Sorry. You do not have the necessary privilege to view this page.";
}
$block = new Block_i;
- $ary['section'] = "Admin";
$breadcrumb = breadcrumb($ary);
--- 3,88 ----
/* $Id$ */
! $pagetitle = "Polls"; // The name to be displayed in the header
! $xsiteobject = "Poll Booth"; //Defines The META TAG Page Type
require("config.php3");
page_open(array("sess"=>"slashSess","auth"=>"slashAuth","perm"=>"slashPerm"));
! /* parse cmd line variables into array */
! while ( list($key, $val) = each($HTTP_GET_VARS )) {
! $ary[$key] = $val;
! }
! if ((!$section) AND (!$section_id)){
! $section = $_PSL['site_homesection'];
! if(!$section) {
! $section = "Home";
! }
! $ary['section'] = $section;
! } else {
! $pagetitle .= " - $section";
! }
! // TODO: Make this work with $HTTP_*_VARS
! /* the comment stuff is using "story_id" so we have to funky
! fix it here. */
! if (!$ary['question_id'] && $ary['story_id']) {
! $question_id = $ary['story_id'];
! } else {
! $question_id = $ary['question_id'];
! }
+ $as = arg_separator("1"); # Default: = &
$poll = new Poll;
! // debug("HTTP_POST_VARS", $HTTP_POST_VARS);
! // debug("HTTP_GET_VARS", $HTTP_GET_VARS);
!
! /* setting up the possible comment variables... */
! $cmtary['mode'] = $ary['mode'];
! $cmtary['order'] = $ary['order'];
! $cmtary['question_id'] = $question_id;
!
! switch ($ary['submit']) {
! case "vote":
! if($poll->vote($question_id, $answer_id, $REMOTE_ADDR)) {
! $content .= pslgetText('VOTE: ') . $poll->message . "<BR>\n";
! } else {
! $content .= getError($poll->getMessage());
}
+ /* NOTE: there's no "break" here, cause after you vote, we
+ roll down and "viewresults" */
+
+ case "viewresults":
+
+ /* we register the "return link" in case they post a comment */
+ $return_link = $HTTP_SERVER_VARS["REQUEST_URI"];
+ $sess->register("return_link");
+
+ $content .= $poll->resultPage($cmtary);
break;
!
! case "viewbooth":
! $content .= getTitlebar ("100%", pslgetText("View Pollbooth"));
! $content .= "<center>\n";
! $content .= getFancybox (210, sprintf(pslgetText("%s Poll"), $_PSL['site_name']), $poll->getPollBooth($question_id), "nc");
! $content .= "</center>\n";
break;
!
! case "list":
! $content .= $poll->listPolls ($ary['min']);
break;
!
! default:
! if ($question_id) {
! $content .= $poll->resultPage($cmtary);
} else {
! // Umm min isn't defined anywhere for a default
! $content .= $poll->listPolls ($ary['min']);
}
}
$block = new Block_i;
$breadcrumb = breadcrumb($ary);
***************
*** 122,125 ****
--- 137,141 ----
slashfoot();
page_close();
+
?>
|
|
From: Joe S. <joe...@us...> - 2002-06-25 22:51:23
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv10563/phpslash-ft Modified Files: CHANGES Log Message: correct commit for poll.php3 Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.533 retrieving revision 1.534 diff -C2 -d -r1.533 -r1.534 *** CHANGES 24 Jun 2002 19:57:01 -0000 1.533 --- CHANGES 25 Jun 2002 22:51:20 -0000 1.534 *************** *** 13,16 **** --- 13,19 ---- 9 - Removal of something (kill -9 :) + 2002-June-25 5:30PM CDT Joe Stewart <joe...@us...> + [B] - poll.php3 - correct commit from Mon Jun 17 16:54:51 2002 UTC. + 2002-June-24 2:30PM CDT Joe Stewart <joe...@us...> [W] - contrib/cronmail.php3 - Luis contributed changes to update the |
|
From: Joe S. <joe...@us...> - 2002-06-24 19:58:53
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv19541/phpslash-ft/public_html/templates/en/basic
Modified Files:
authorProfile.tpl mailinglistAdmin.tpl
Log Message:
missing TITLEBAR
Index: authorProfile.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/authorProfile.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** authorProfile.tpl 1 Jun 2002 15:05:39 -0000 1.3
--- authorProfile.tpl 24 Jun 2002 19:58:50 -0000 1.4
***************
*** 1,3 ****
--- 1,4 ----
<!-- start authorProfile.tpl -->
+ {TITLEBAR}
<div id="authorProfile">
<form action="{ACTION_URL}" method="post">
Index: mailinglistAdmin.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/mailinglistAdmin.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailinglistAdmin.tpl 9 Apr 2002 16:57:06 -0000 1.2
--- mailinglistAdmin.tpl 24 Jun 2002 19:58:50 -0000 1.3
***************
*** 1,3 ****
--- 1,4 ----
<!-- Start mailinglistAdmin.tpl -->
+ {TITLEBAR}
<div id="mailingListAdmin">
<h3><a href="mailinglistAdmin.php3?action=newsletter">Send a new newsletter to the list</a></h3>
|
|
From: Joe S. <joe...@us...> - 2002-06-24 19:58:53
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv19541/phpslash-ft/public_html/templates/en/default
Modified Files:
authorProfile.tpl mailinglistAdmin.tpl
Log Message:
missing TITLEBAR
Index: authorProfile.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/authorProfile.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** authorProfile.tpl 1 Jun 2002 15:05:39 -0000 1.3
--- authorProfile.tpl 24 Jun 2002 19:58:50 -0000 1.4
***************
*** 1,3 ****
--- 1,4 ----
<!-- authorProfile.tpl -->
+ {TITLEBAR}
<FORM ACTION="{ACTION_URL}" METHOD=POST>
<TABLE BORDER=0>
Index: mailinglistAdmin.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/mailinglistAdmin.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mailinglistAdmin.tpl 3 Dec 2000 21:32:35 -0000 1.2
--- mailinglistAdmin.tpl 24 Jun 2002 19:58:50 -0000 1.3
***************
*** 1,4 ****
-
<!-- Start mailinglistAdmin.tpl -->
<FONT SIZE=+1>
<A HREF="mailinglistAdmin.php3?action=newsletter">
--- 1,4 ----
<!-- Start mailinglistAdmin.tpl -->
+ {TITLEBAR}
<FONT SIZE=+1>
<A HREF="mailinglistAdmin.php3?action=newsletter">
|
|
From: Joe S. <joe...@us...> - 2002-06-24 19:57:05
|
Update of /cvsroot/phpslash/phpslash-ft/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv18826/phpslash-ft/contrib
Modified Files:
cronmail.php3
Log Message:
missing TITLEBAR
Index: cronmail.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/contrib/cronmail.php3,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cronmail.php3 12 Mar 2002 12:20:59 -0000 1.2
--- cronmail.php3 24 Jun 2002 19:57:02 -0000 1.3
***************
*** 1,72 ****
#!/usr/bin/php
<?php
! /*
! * $Id$
! * Last modified: 2002-Mar-12
! * Luis Mondesi < le...@ho... >
! *
! * NOTE: originally created by ... modified for
! * phpslash 0.65-pre1 by Luis Mondesi
! *
! * USAGE: Run this from a cron job (CGI version of php),
! * even though it should
! * run just fine from your current site root. For as long
! * as you keep in mind that anybody might be able to run this...
! * unless of course, page_open(PERMISSIONS) and page_close()
! * are used to protect the code using PHPLIB's session management
! * routines.
! * This script requires a directory called 'text' parallel to it.
! * This directory should be writable by which ever user runs this
! * cron script, or by whichever user runs your server (if apache's
! * mod_php is used).
! * To run as a cron...
! */
! // example for cron:
! // 00 */24 * * * php /path/to/cronmail.php3 2>&1 > /dev/null
! /* Basically, send this headlines every 24 hours and don't show
! * any errors please...
! * Another even better option would be to put this file
! * in /etc/cron.daily and make sure you have:
! * #!/path/to/php
! * at the beginning of this script
! *
! * that's all...
! *
! *
! * There is no need to touch anything in this script. All your
! * customizations should be done in your current config.php3
! * You should put a .htaccess file in the directory from which
! * this is going to run containing the following customization
! * options (for PHP 4.x and up):
! *
! * php_flag magic_quotes_gpc Off
! * php_value include_path ".:/path/to/phplib:/path/to/phpslash"
! * #optional:
! * #php_value disable_functions phpinfo,readfile,system
! * #optional: do not report errors : ~E_ALL
! * #php_value error_reporting E_ALL
! *
! * Do they look familiar? basically it's the same set of
! * options that you might be using for phpslash...
! *
! * TODO: template this baby! :-)
! */
- require_once("prepend.php3");
- require_once("config.php3");
! // variable initialization (do not modify)
! $str_out = "";
! $freqoverride = 0;
! $errors = array();
! $row = array();
! $sql = "";
! /////////////////// send_mailing_list.php3 /////////////////////////
! if (!function_exists('format_mail')) {
! function format_mail($str, $char_len, $scrub) {
! if ($scrub)
! {
$str = stripslashes($str);
$str = strip_tags($str);
--- 1,304 ----
#!/usr/bin/php
<?php
! // $id $
! // Written by 'Blake'
! // Modified for phpSlash (v0.65) by:
! // Luis Mondesi <le...@ho...>
! // Last modified: 2002-Jun-12
! //
! // NOTES:
! // The following is an example of how the tables should
! // look like. Check the alter_table...sql script
! // for altering the .65f tables for this script
! // to work...
! //
! // Table structure for table 'psl_mailinglist'
! //
! //CREATE TABLE psl_mailinglist (
! // id int(30) DEFAULT '0' NOT NULL auto_increment,
! // email varchar(100) DEFAULT '' NOT NULL,
! // name varchar(100),
! // timestamp timestamp(14),
! // html tinyint(2) DEFAULT '0' NOT NULL,
! // PRIMARY KEY (id),
! // UNIQUE email (email)
! //);
! //
! // ALTER TABLE psl_mailinglist MODIFY id int(30) DEFAULT '0' NOT NULL auto_increment, MODIFY email varchar(100) DEFAULT '' NOT NULL, MODIFY name varchar(100), MODIFY timestamp timestamp(14), ADD html tinyint(2) DEFAULT '0' NOT NULL;
! //
! //
! //
! // Table structure for table 'mailing_frequency'
! //
! //CREATE TABLE psl_mailinglist_frequency (
! // id int(30) DEFAULT '0' NOT NULL,
! // frequency char(30) DEFAULT '' NOT NULL,
! // dayback int(11) DEFAULT '0' NOT NULL
! //);
! //
! //ALTER TABLE psl_mailinglist_frequency MODIFY id int(30) DEFAULT '0' NOT NULL, MODIFY frequency char(30) DEFAULT '' NOT NULL, MODIFY dayback int(11) DEFAULT '0' NOT NULL;
! //
! //
! // Sample header.txt contents:
! //
! // phpSlash Daily Headline Mailer
! //
! //
! // MORE NOTES:
! // The Debian folks should get the php4-cgi
! // package (from the 'woody' distro: apt-get install php4-cgi)
! // and then edit their /etc/php/cgi/php.ini
! // to include the extensions for mysql (mysql.so)
! //
! // TODO:
! // 1) Major cleanup necessary...
! // 2) test in a different system
! // 3) use the functions from the classes only
! // (clean up the mysql_pconnect() block and all
! // that mess...)
! //
! // And now the code.....
! //..........................
! require("../phplib/prepend.php3");
! require("../phplib/config.php3");
+ $rightnow = date("Hi"); //figures out what time it is
! // Busy server? set this baby to sleep. 0 means it mails as fast as it can
! // it's in seconds
! $sleep = 5;
!
! //these 2 are used to format the mail to make it shorter and so it wraps at a certain length
! $wraplength = 800;
! $choplength = 600;
!
! //since you want to include a message daily, it's a separate file
! //remember to make it HTML if you are using the HTML option.
! //tags are stripped for plain text
!
! $filename = "./header.txt";
! $fd = fopen ($filename, "r");
! $header = fread ($fd, filesize ($filename));
! fclose ($fd);
!
! $sitename = $_PSL['site_name']; // used in the title, and subject, and body of mail
! $siteurl = $_PSL['rooturl'];
!
! if ($html==1){
! $yourtitle = "<h1>$sitename</h1>"; // used in HTML title of email
! $mailsubj = $_PSL['mailinglist_subject']; //change this too, used for HTML Subject of HTML mail
! } else {
! $yourtitle = $site_name; //uh, used not really
! $mailsubj = $_PSL['mailinglist_subject']; // Subject of plain text email
! }
! $sender = preg_replace("/(.*)\@.*/i","noreply",$_PSL['site_owner']);
!
! // The footer ends up as the last thing in the mail.
! // Tags are stripped for plain text
! // you may want to move this out to a file like
! // the header if you feel the need
! $footer = "<P><B>\n\t To add or remove yourself go to:\n<BR>".$siteurl."/mailinglist.php3</B><P></BODY></HTML>";
!
! /*********************************************************
! **** NO NEED TO CHANGE ANYTHING BELOW THIS LINE **********
! *********************************************************/
!
! if ($rightnow == "0100"){
! $limit = "0,100";
! $today = date("w");
! if($today=="1") { $offset = "3"; }
! else { $offset = "2"; }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0115") {
! $limit = "99,101";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0130") {
! $limit = "200,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0145") {
! $limit = "300,100";
! $today = date("w");
! if($today=="1") { $offset = "3"; }
! else { $offset = "2"; }
! $frequency = "DAY";
! $html =0;
!
! } elseif ($rightnow == "0200") {
! $limit = "400,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0215") {
! $limit = "500,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0230") {
! $limit = "600,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0245") {
! $limit = "700,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0300") {
! $limit = "800,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0315") {
! $limit = "900,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0330") {
! $limit = "1000,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0345") {
! $limit = "1100,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0400") {
! $limit = "1200,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! } elseif ($rightnow == "0415") {
! $limit = "1300,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html =0;
! }
! //that was the last of the normal daily emails
! elseif ($rightnow == "0430") {
! $limit = "0,200";
! $today = date("w");
! $html =0;
! if($today=="1") {
! $offset = "7";
! $frequency = "MONDAY";
! } else {
! die;
! }
! } elseif ($rightnow == "0445") {
! $limit = "0,200";
! $today = date("w");
! $html =0;
! if($today=="3") {
! $offset = "7";
! $frequency = "WEDNESDAY";
! } else {
! die;
! }
! } elseif ($rightnow == "0500") {
! $limit = "0,200";
! $today = date("w");
! $html =0;
! if($today=="5") {
! $offset = "7";
! $frequency = "FRIDAY";
! } else {
! die;
! }
! } elseif ($rightnow == "0515") {
! $limit = "0,200";
! $today = date("w");
! $html =0;
! if($today=="0") {
! $offset = "7";
! $frequency = "SUNDAY";
! } else {
! die;
! }
! }
! ///here is the experimental HTML one
! elseif ($rightnow == "0530") {
! $limit = "0,100";
! $today = date("w");
! if($today=="1") {
! $offset = "3";
! } else {
! $offset = "2";
! }
! $frequency = "DAY";
! $html = 1;
! }
!
! /* use functions.inc format_mail() so that you can scrub things ;-)
! function format_mail($str, $char_len)
! {
! GLOBAL $wraplength;
$str = stripslashes($str);
$str = strip_tags($str);
***************
*** 75,101 ****
$str = ereg_replace("\r\n"," ",$str);
$str = eregi_replace("[[:space:]]+", " ", $str);
! //probably over done, maybe be better to str_replace here
! }
! // this strip slashes seems to be extra, but im not sure
! $str = stripslashes($str);
! while(strlen($str) != 0) {
! if (strlen($str) > $char_len)
! $len = strrpos(substr($str, 0, $char_len - 1), " ");
! else
! $len =0;
! // in case of no spaces
! if(!$len) {
! $len = $char_len - 1;
! }
! $str_out .= substr($str, 0, $len) . "\n";
! $str = substr($str, $len, strlen($str));
! }
return $str_out;
! }
! }//end if not function_exists
! function build_body($offset) {
! global $_PSL;
! $slash_q = new slashDB;
$bmonth = date("m");
$bday = date("d") - $offset;
--- 307,341 ----
$str = ereg_replace("\r\n"," ",$str);
$str = eregi_replace("[[:space:]]+", " ", $str);
! $str_out .= substr($str, 0, $wraplength);
! $str = substr($str, 0, $wraplength);
return $str_out;
! }
! */
! function format_html_mail($str, $char_len)
! {
! GLOBAL $wraplength;
! $str = stripslashes($str);
! $str = eregi_replace("\n"," ",$str);
! $str = eregi_replace("\t"," ",$str);
! $str = ereg_replace("\r\n"," ",$str);
! $str = eregi_replace("[[:space:]]+", " ", $str);
! $str_out .= substr($str, 0, $wraplength);
! $str = substr($str, 0, $wraplength);
! return $str_out;
! }
+ function chopit ($str)
+ {
+ GLOBAL $choplength;
+ $string = substr($str, 0, $choplength);
+ $pos = strrpos ($string, ".");
+ $finalstring = substr($string, 0, $pos);
+ return $finalstring;
+ }
+
+ function build_body($offset)
+ {
+ GLOBAL $offset;
+ $slash_q = new slashDB;
$bmonth = date("m");
$bday = date("d") - $offset;
***************
*** 106,237 ****
$begdate = date("Y-m-d H:i:s", mktime(0,0,0,$bmonth,$bday,$byear));
$enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear));
- $sql="SELECT story_id, title, dept, user_id, time, ".
- " intro_text, author_name, author_id FROM psl_story, psl_author ".
- " WHERE psl_story.time >= '$begdate' AND psl_story.time <= '$enddate' ".
- " AND psl_story.user_id = psl_author.author_id ".
- " ORDER BY time desc";
$slash_q->query($sql);
! $site = $_PSL["rooturl"];
! while($slash_q->next_record())
! {
! $headline = $slash_q->Record["title"] . "\n";
$headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.\n";
! $headline .= " Posted by: \"" . $slash_q->Record["author_name"] . "\" on: " . $slash_q->Record["time"] . "\n";
! $headline .= " Story: " . format_mail($slash_q->Record["intro_text"],76,True) . "\n";
! $headline .= " $site" . "/article.php3?story_id=" . $slash_q->Record["story_id"] . "\n";
$headline .= "---------------------------------------------------------------------------------------------\n\n";
$headline = stripslashes($headline);
$thisHead .= $headline;
! }
return $thisHead;
! }
! $SLEEP = 1;
! // easier to use the external file, otherwise you gotta mod this file alot
! $NEWSLETTER_FILE_PATH = "./text/";
! $header = "=================\n\n";
! $footer = "+++++++++++++++++++++++++++\n";
! if($file = fopen("./text/news_header.txt", "w+"))
! { //if opened header file
! if(!fputs($file, $header))
! print("Header file could not be written to.<br>");
! fclose($file);
! } //end if open header file
! else
! print("Header file could not be opened/created ");
!
! if($file = fopen("./text/news_footer.txt", "w+"))
! { //if opened footer file
! if(!fputs($file, $footer))
! print("Footer file maybe empty.");
! fclose($file);
! } //end if opened file
! else
! print("Footer file could not be opened/created. ");
! if($header) { $header = format_mail($header, 700,False); }
! if($footer) { $footer = format_mail($footer, 76,False); }
! //-------------------------SEND MAIL
! $slash_q = new slashDB;
! if ($freqoverride){
! //Mail testing Lines to Debug Put Here By Blake
! // $sql = "SELECT email, name FROM mailing_list";
! //$sql = "SELECT 'ne...@li...', 'Mad Hatter'";
! $body = build_body(0);
}
! else {
! $sql .= "SELECT email, name, dayback, frequency ";
! $sql .= "FROM psl_mailinglist, psl_mailinglist_frequency ";
! $sql .= "WHERE psl_mailinglist.id = psl_mailinglist_frequency.id ";
! $sql .= "AND (psl_mailinglist_frequency.frequency='" . date("l") . "' ";
! $sql .= "OR psl_mailinglist_frequency.frequency = 'DAY' ";
! if (date("d") == 1) $sql .= "OR mailing_frequency.frequency = 'MONTH' ";
! $sql .= ") ORDER BY dayback, mailing_frequency.frequency";
! }
! // $db_results = mysql_query($sql, $slash_q) or die(mysql_error());
! $link = mysql_pconnect($_PSL['DB_Host'],$_PSL['DB_User'],$_PSL['DB_Password']);
! $db_results = mysql_db_query($_PSL['DB_Database'],"SELECT email, name, dayback, frequency
! FROM psl_mailinglist, psl_mailinglist_frequency
! WHERE psl_mailinglist.id = psl_mailinglist_frequency.id
! AND (psl_mailinglist_frequency.frequency = 'DAY'
! OR psl_mailinglist_frequency.frequency = 'DAY')
! ORDER BY dayback, psl_mailinglist_frequency.frequency",$link);
! ignore_user_abort();
! flush();
! $tmpDay = '';
! $sender = preg_replace("/(.*)\@.*/i","noreply",$_PSL['site_owner']);
! while($row = mysql_fetch_row($db_results)) {
! set_time_limit(SLEEP + 30);
! if($freqoverride){
! echo "TO: $row[0] Name: $row[1]";
! }
! else{
! if($row[2] != $tmpDay){
! if (!$override)
! $body = build_body($row[2]);
! }
! /* if ($row[3] != "DAY"){
! if ($row[3] != "MONTH"){
! if ($row[2] != "7"){
! $subject = "Headines for the past ". $row[2] . " days (" . date("m/d/Y") . ")";}
! else{
! $subject = "Weekly Headlines (" . date("m/d/Y") . ")";}
! }
! else{
! $subject = "Monthly Headlines (" . date("m/d/Y") . ")";}
! }
! */
! // Debug Line Commented out-->
! //echo "\nTO: $row[0] Name: $row[1] DayBack: $row[2] Freq: $row[3]";
! }
! $subject=$_PSL['mailinglist_subject'];
! if(mail($row[0], $subject, "Dear " . $row[1] . ",\n\n" . $header . "\n\n" . $body . "\n\n" . $footer, "From: " . $sender))
! echo "\n" . $row[0] . "... sent";
! else
! $errors[] = $row[0];
! $tmpDay = $row[2];
! if(SLEEP) { sleep(SLEEP); }
! }
! //-------------------------SEND MAIL
! // yes it's just a mail(), does not scale well, should use a CGI or something I guess
! $file = @fopen($NEWSLETTER_FILE_PATH . "send_log.txt", "w");
! if($errors)
! { //if errors
! print("Some mail could not be sent:<p>\n");
! for($i = 0; $i < count($errors); $i++)
! { //open for
! @fputs($file, $errors[$i] . " could not be sent.\n");
! print($errors[$i] . " could not be sent.<br>\n");
! } //close for
! } //end if errors
! else
! { //else errors
! print("\nList was sent out without errors.<br>");
! @fputs($file, "List was sent out without errors.\n");
! } //else errors
! fclose($file);
?>
--- 346,471 ----
$begdate = date("Y-m-d H:i:s", mktime(0,0,0,$bmonth,$bday,$byear));
$enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear));
+ // this should get the stories using the class
+ // but, for the moment 2002-06-12 luis mondesi:
+ $sql="SELECT story_id, title, dept, ".
+ " date_format(time, \"%W %M %d %h %i %p\") as pretty_time, ".
+ " intro_text FROM psl_story ".
+ " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC";
$slash_q->query($sql);
! while($slash_q->next_record()){
! GLOBAL $siteurl;
! $headline = "\n".format_mail($slash_q->Record["title"],500,true) . "\n";
$headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.\n";
! $headline .= " Posted on: \"" . $slash_q->Record["pretty_time"] . "\n";
! $headline .= " Story: " . format_mail($slash_q->Record["intro_text"],500,true) . ".\n";
! $headline .= " ".$siteurl."article.php3?story_id=" . $slash_q->Record["story_id"]."\n";
$headline .= "---------------------------------------------------------------------------------------------\n\n";
$headline = stripslashes($headline);
$thisHead .= $headline;
! }
return $thisHead;
! }
! function build_html_body($offset)
! {
! GLOBAL $offset;
! $slash_q = new slashDB;
! $bmonth = date("m");
! $bday = date("d") - $offset;
! $byear = date("Y");
! $emonth = date("m");
! $eday = date("d");
! $eyear = date("Y");
! $begdate = date("Y-m-d H:i:s", mktime(0,0,0,$bmonth,$bday,$byear));
! $enddate = date("Y-m-d H:i:s", mktime(0,0,0,$emonth,$eday + 1,$eyear));
! $sql=" SELECT story_id, title, dept, ".
! " date_format(time, \"%W %M %d %h %i %p\") as pretty_time, ".
! " intro_text FROM psl_story ".
! " WHERE time >= '$begdate' AND time <= '$enddate' ORDER BY time DESC";
! $slash_q->query($sql);
!
! while($slash_q->next_record()) {
! GLOBAL $siteurl;
! $headline = "<B>".format_mail($slash_q->Record["title"],500,true) . "</B><BR>\n";
! $headline .= " From the: \"" . $slash_q->Record["dept"] . "\" dept.<BR>\n";
! $headline .= " Posted on: \"" . $slash_q->Record["pretty_time"] . "<BR>\n";
! $headline .= " Story: " . format_mail(chopit($slash_q->Record["intro_text"]),500,true) . ".</I><BR>\n";
! $headline .= "<A HREF=\"".$siteurl."article.php3?story_id=" . $slash_q->Record["story_id"] . "\">Full Story</A>\n";
! $headline .= "<BR>---------------------------------------------------------------------------------------------<BR>\n\n";
! $headline = stripslashes($headline);
! $thisHead .= $headline;
}
! return $thisHead;
! }
! // mail goes out below here now
! // use slashDB class later ...
! // $db = new slashDB;
! $link = mysql_pconnect($_PSL['DB_Host'],$_PSL['DB_User'],$_PSL['DB_Password']);
! // limit is blank for some reason...
! $limit = ($limit == '')? "0,100":$limit;
! // if HTML is null ... then select text
! $html = ($html == '')? "0":$html;
! // if frequency is null, then select DAY
! $frequency = ($frequency == '')? "DAY":$frequency;
!
! $sql_query="SELECT email, dayback, frequency"
! ." FROM psl_mailinglist, psl_mailinglist_frequency"
! ." WHERE psl_mailinglist.id = psl_mailinglist_frequency.id"
! ." AND psl_mailinglist_frequency.frequency = '$frequency'"
! ." AND psl_mailinglist.html = '$html'"
! ." ORDER BY psl_mailinglist_frequency.dayback, psl_mailinglist_frequency.frequency"
! ." LIMIT $limit";
! $db_results = mysql($_PSL['DB_Database'],$sql_query,$link)
! or die("ERROR: $sql_query connecting to ".$_PSL['DB_Database']." with link $link \n ");
!
! ignore_user_abort();
! flush();
!
! $tmpDay = '';
!
! while($row = mysql_fetch_row($db_results)) {
! //while ($db->next_record()) {
! //$row = $db->f("");
! GLOBAL $sender;
! GLOBAL $html;
! //first part is the plain text email
! if($html==0) {
! set_time_limit(0);
! $header= strip_tags($header);
! $body = $header;
! $body .= build_body($row[2]);
! $body .= strip_tags($footer);
! $subject = $mailsubj;
! $headers = "Reply-To:$sender\r\n";
! $headers .= "From:$sender\r\n";
! if (mail($row[0], $subject, $body, $headers))
! echo "\n" . $row[0]. $row[2] . "\n... sent\n";
! else
! $errors[] = $row[0];
! $tmpDay = $row[2];
! sleep($sleep);
! } //closes if html=0 so that means the HTML goes out from below here
! else {
! set_time_limit(0);
! $body = "<html><head><title>" . $yourtitle."</title><BASE HREF=\"".$siteurl."\"></head><body>\r\n\n\n";
! $body .= $header;
! $body .= build_html_body($row[2]);
! $body .= $footer;
! $subject = $mailsubj;
! $headers = "Reply-To:$sender\r\n";
! $headers .= "From:$sender\r\n";
! $headers .= "Content-type: text/html; charset=iso-8859-1\r\n";
! if (mail($row[0], $subject, $body, $headers))
! echo "\n" . $row[0]. $row[2] . "\n... sent\n";
! else
! $errors[] = $row[0];
! $tmpDay = $row[2];
! sleep($sleep);
! }//closes else for html = 0
! }//closes the mail function
?>
|
|
From: Joe S. <joe...@us...> - 2002-06-24 19:57:05
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv18826/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
missing TITLEBAR
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** phpslash.sgml 20 Jun 2002 23:59:40 -0000 1.48
--- phpslash.sgml 24 Jun 2002 19:57:02 -0000 1.49
***************
*** 784,787 ****
--- 784,788 ----
loginblock.tpl
loginformCR.tpl
+ mailinglistAdmin.tpl
navbarBlock.tpl
pollList.tpl
|
|
From: Joe S. <joe...@us...> - 2002-06-24 19:57:05
|
Update of /cvsroot/phpslash/phpslash-ft In directory usw-pr-cvs1:/tmp/cvs-serv18826/phpslash-ft Modified Files: CHANGES Log Message: missing TITLEBAR Index: CHANGES =================================================================== RCS file: /cvsroot/phpslash/phpslash-ft/CHANGES,v retrieving revision 1.532 retrieving revision 1.533 diff -C2 -d -r1.532 -r1.533 *** CHANGES 20 Jun 2002 23:48:36 -0000 1.532 --- CHANGES 24 Jun 2002 19:57:01 -0000 1.533 *************** *** 13,16 **** --- 13,22 ---- 9 - Removal of something (kill -9 :) + 2002-June-24 2:30PM CDT Joe Stewart <joe...@us...> + [W] - contrib/cronmail.php3 - Luis contributed changes to update the + cronmail.php3 script. The database changes and header.txt file contents + are explained in the script header. + [BT] - authorProfile.tpl, mailinglistAdmin.tpl - missed the TITLEBAR tags. + 2002-June-20 6:30PM CDT Joe Stewart <joe...@us...> [B] - slash-all.sql - some versions of mysql would not import the |
|
From: Joe S. <joe...@us...> - 2002-06-21 00:06:17
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default
In directory usw-pr-cvs1:/tmp/cvs-serv29506a/default
Modified Files:
slashHead.tpl
Log Message:
rss link rel tag in header
Index: slashHead.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/default/slashHead.tpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** slashHead.tpl 20 Jun 2002 23:48:37 -0000 1.14
--- slashHead.tpl 21 Jun 2002 00:06:13 -0000 1.15
***************
*** 14,18 ****
<META name="{METANAME}" CONTENT="{METADESCRIPTION}">
<!-- END each_metatag -->
! <link rel="alternate" type="text/xml" title="XML" href="{ROOTDIR}/backend.php3" />
</HEAD>
<BODY BGCOLOR="#3F4469" text="#000000" link="#3F4469" vlink="#004469">
--- 14,18 ----
<META name="{METANAME}" CONTENT="{METADESCRIPTION}">
<!-- END each_metatag -->
! <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
</HEAD>
<BODY BGCOLOR="#3F4469" text="#000000" link="#3F4469" vlink="#004469">
|
|
From: Joe S. <joe...@us...> - 2002-06-21 00:06:17
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv29506a/basic
Modified Files:
slashHead.tpl
Log Message:
rss link rel tag in header
Index: slashHead.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/slashHead.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slashHead.tpl 20 Jun 2002 23:48:37 -0000 1.5
--- slashHead.tpl 21 Jun 2002 00:06:13 -0000 1.6
***************
*** 14,18 ****
<meta name="{METANAME}" content="{METADESCRIPTION}" />
<!-- END each_metatag -->
! <link rel="alternate" type="text/xml" title="XML" href="{ROOTDIR}/backend.php3" />
<link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
--- 14,18 ----
<meta name="{METANAME}" content="{METADESCRIPTION}" />
<!-- END each_metatag -->
! <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
<link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
|
|
From: Joe S. <joe...@us...> - 2002-06-20 23:59:49
|
Update of /cvsroot/phpslash/phpslash-ft/doc/html
In directory usw-pr-cvs1:/tmp/cvs-serv27866/phpslash-ft/doc/html
Modified Files:
phpslash.sgml
Log Message:
rss link rel tag in header
Index: phpslash.sgml
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/doc/html/phpslash.sgml,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** phpslash.sgml 20 Jun 2002 23:48:36 -0000 1.47
--- phpslash.sgml 20 Jun 2002 23:59:40 -0000 1.48
***************
*** 16,20 ****
<author>
<url url="http://phpslash.sourceforge.net/" name="The phpSlash Group">
! <date>v0.1, June 8, 2002
<abstract>
--- 16,20 ----
<author>
<url url="http://phpslash.sourceforge.net/" name="The phpSlash Group">
! <date>v0.4, March 19, 2002
<abstract>
|
|
From: Joe S. <joe...@us...> - 2002-06-20 23:48:40
|
Update of /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic
In directory usw-pr-cvs1:/tmp/cvs-serv25415/phpslash-ft/public_html/templates/en/basic
Modified Files:
slashHead.tpl
Log Message:
rss link rel tag in header
Index: slashHead.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/templates/en/basic/slashHead.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slashHead.tpl 15 Apr 2002 14:50:22 -0000 1.4
--- slashHead.tpl 20 Jun 2002 23:48:37 -0000 1.5
***************
*** 14,17 ****
--- 14,18 ----
<meta name="{METANAME}" content="{METADESCRIPTION}" />
<!-- END each_metatag -->
+ <link rel="alternate" type="text/xml" title="XML" href="{ROOTDIR}/backend.php3" />
<link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
|
|
From: Joe S. <joe...@us...> - 2002-06-20 23:48:40
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv25415/phpslash-ft/class
Modified Files:
functions.inc slashAuthCR.class
Log Message:
rss link rel tag in header
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** functions.inc 14 Jun 2002 20:25:32 -0000 1.107
--- functions.inc 20 Jun 2002 23:48:37 -0000 1.108
***************
*** 464,468 ****
--- 464,475 ----
}
+ if( !empty($GLOBALS['QUERY_STRING'])) {
+ $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING'];
+ } else {
+ $QUERY_STRING = '';
+ }
+
$templ->set_var(array(
+ 'QUERYSTRING' => $QUERY_STRING,
'SITE_NAME' => $_PSL['site_name'],
'SITE_OWNER' => $_PSL['site_owner'],
Index: slashAuthCR.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/slashAuthCR.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** slashAuthCR.class 24 May 2002 15:25:16 -0000 1.13
--- slashAuthCR.class 20 Jun 2002 23:48:37 -0000 1.14
***************
*** 207,212 ****
setcookie( 'user_info', base64_encode(serialize($cookie_ary)), time()+31536000,$this->psl['rooturl'] , "" , "");
}
! // may need to get legacy records
! $this->auth["perm"] = $this->db->Record["perms"];
$this->auth["perm"] = $this->get_userperms( $uid);
--- 207,211 ----
setcookie( 'user_info', base64_encode(serialize($cookie_ary)), time()+31536000,$this->psl['rooturl'] , "" , "");
}
! // may also need to get legacy records
$this->auth["perm"] = $this->get_userperms( $uid);
***************
*** 399,406 ****
WHERE group_id = '$group_id' ";
$db2 = new slashDB;
- // debug("q", $q);
$db2->query($q);
while ($db2->next_record()) {
! $this->auth["perm"][$this->db->Record['group_name']][$db2->Record['section_id']] = true;
}
}
--- 398,406 ----
WHERE group_id = '$group_id' ";
$db2 = new slashDB;
$db2->query($q);
while ($db2->next_record()) {
! $section_perm = "section_id". $db2->Record['section_id'];
! debug("section_perm", $section_perm);
! $this->auth["perm"][$this->db->Record['group_name']][$section_perm] = true;
}
}
***************
*** 414,418 ****
group_id
FROM psl_group ";
! // debug("q", $q);
$this->db->query($q);
--- 414,418 ----
group_id
FROM psl_group ";
! // debug("q", $q);
$this->db->query($q);
***************
*** 452,455 ****
--- 452,466 ----
while ($db2->next_record()) {
$this->auth['perm'][$group_name][$childgroup_name][$db2->Record['permission_name']] = true;
+
+ $q = "SELECT section_id
+ FROM psl_group_section_lut
+ WHERE group_id = '$group_id' ";
+ $db3 = new slashDB;
+ $db3->query($q);
+ while ($db3->next_record()) {
+ $section_perm = $db3->Record['section_id'];
+ $this->auth["perm"][$group_name][$childgroup_name][$section_perm] = true;
+ }
+
}
|
2 messages has been excluded from this view by a project administrator.
