phpslash-commit — A list for automatically mailed SCM Commits

[Phpslash-commit] CVS: phpslash-dev/public_html/admin variableAdmin.php,1.1.1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13201/phpslash-dev/public_html/admin

Modified Files:
	variableAdmin.php 
Log Message:
removed classes that already had been moved to module directories.  moved Infolog and slashAuth to module directories.

Index: variableAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/variableAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** variableAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- variableAdmin.php	15 Sep 2004 23:31:47 -0000	1.2
***************
*** 1,155 ****
  <?php
  
! // $Id$ 
! 
! require("config.php");
! 
! # header title
! $pagetitle = pslgetText("Administration");
! 
! #Defines The META TAG Page Type
! $xsiteobject = pslgetText("Administration");
! 
! if (!is_object($sess)) {
!    page_open($_PSL['page_features']);
! }
! /*****************************
!      START OF PAGE
! *****************************/
! 
! $auth->login_if(!$perm->have_perm('variableList'));
! 
! /* DEBUG */
! 
! // debug( "HTTP_POST_VARS" , $HTTP_POST_VARS);
! // debug( "HTTP_GET_VARS" , $HTTP_GET_VARS);
! // debug( "variable_name", $variable_name );
! 
! /* DEBUG */
! 
! $variable = pslNew("Variable");
! 
! $content = '';
! 
! if(!empty($HTTP_POST_VARS['submit'])) {
!    $submit = clean($HTTP_POST_VARS['submit']);
!    $variable_ary = clean($HTTP_POST_VARS['variable_ary']);
!    $variable_name = clean($HTTP_POST_VARS['variable_name']);
!    $variable_id = clean($HTTP_POST_VARS['variable_id']);
!    $description = clean($HTTP_POST_VARS['description']);
!    $variable_value = clean($HTTP_POST_VARS['variable_value']);
!    $variable_group = clean($HTTP_POST_VARS['variable_group']);
! } elseif (!empty($HTTP_GET_VARS['submit'])) {
!    $submit = clean($HTTP_GET_VARS['submit']);
! } else {
!    $submit = '';
! }
! 
! if ($perm->have_perm("variableList")) {
!    switch ($submit) {
!       case "delete":
!          if($perm->have_perm("variableDelete")) {
!             while ( list( $key, $val ) = each( $variable_ary ) ) {
!                $success = $variable->deleteVariable($variable_ary[$key]);
!             }
! 	      }
!          break;
!       case "new":
!          if($perm->have_perm("variableSave")) {
!             $success = $variable->saveVariable(clean($HTTP_POST_VARS));
!          }
! 	      break;
!       case "update":
!          if($perm->have_perm("variableEdit")) {
!             reset ($variable_id);
!             while ( list( $key, $val ) = each( $variable_id ) ) {
!                $ary["variable_id"]    = $variable_id[$key];
!                $ary["variable_name"]  = $variable_name[$key];
!                $ary["description"]    = $description[$key];
!                $ary["value"]          = $variable_value[$key];
!                $ary["variable_group"] = $variable_group[$key];
! 
!                if ($variable->saveVariable($ary)) {
!                   $content .= "<em>$variable_name[$key]</em> has been updated<BR>\n";
!                } else {
!                   $content .= "<em>$variable_name[$key]</em> has <strong>not</strong> been updated<BR>\n";
!                }
  
!             }
!          }
!          break;
!       default:
!          break;
!    }
!    if($perm->have_perm("variableNew")) {
!       $content .= $variable->newVariable();
!    }
!    if($perm->have_perm("variableList")) {
!       $content .= $variable->listVariable();
!    }
!    
! } else {
  
!    $content = getTitlebar("100%","Error! Invalid Privileges");
!    $content .= "Sorry. You do not have the necessary privilege to view this page.";
  }
  
- $ary = '';
- 
- $block = pslNew("Block_i");
- $ary['section'] = "Admin";
-  
- // $breadcrumb = breadcrumb($ary);
- 
  $_PSL['metatags']['object'] = $xsiteobject;
  
! slashhead($pagetitle,$_PSL['metatags']);
! 
! $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";
!    } else {
!          $tplfile = 'index2colright.tpl';
!    }
! } elseif (empty($rightblocks)) {
!    $tplfile = 'index2colleft.tpl';
! } else {
!    $tplfile = 'index3col.tpl';
! }
  
! $template = pslNew("slashTemplate",$_PSL['templatedir']);
! $template->debug = 0;
! $template->set_file(array(
!    'index'  => $tplfile //"index3col.tpl"
! ));
  
! if( !empty($GLOBALS['QUERY_STRING'])) {
!    $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING'];
! } else {
!    $QUERY_STRING = '';
! }
!  
! $template->set_var(array(
!    'QUERYSTRING'  => $QUERY_STRING,
!    'ROOTDIR'      => $_PSL['rooturl'],
!    'IMAGEDIR'     => $_PSL['imageurl'],
!    'BREADCRUMB'   => $breadcrumb,
!    'STORY_COLUMN' => $content,
!    'LEFT_BLOCK_COLUMN'    => $leftblocks,
!    'CENTER_BLOCK_COLUMN'  => $centerblocks,
!    'RIGHT_BLOCK_COLUMN'   => $rightblocks
! ));
  
! $template->parse('OUT','index');
! $template->p('OUT');
  
- slashfoot();
  page_close();
- 
- 
  ?>
--- 1,31 ----
  <?php
+ // $Id$
  
! require('config.php');
  
! $pagetitle   = pslgetText('Variable') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Variable') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
! if(!empty($HTTP_GET_VARS['login'])) {
!   $auth->login_if($HTTP_GET_VARS['login']);
  }
  
  $_PSL['metatags']['object'] = $xsiteobject;
  
! // Objects
  
! $ary['module'] = 'Variable';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
! // setup the block module   
! $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
! $block = pslNew("Block_i");
  
! //show Page
! echo $content;
  
  page_close();
  ?>

[Phpslash-commit] CVS: phpslash-dev/include/modules/infolog Infolog.class,NONE,1.1 admin.php,NONE,1.1

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/infolog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13201/phpslash-dev/include/modules/infolog

Added Files:
	Infolog.class admin.php 
Log Message:
removed classes that already had been moved to module directories.  moved Infolog and slashAuth to module directories.

--- NEW FILE: Infolog.class ---
<?php
/* 
 * Class:   Infolog
 *
 * Layer:   Admin
 * Desc.:   
 *
 * NOTES/TO-DO:
 * 
 */

class Infolog {
   var $templ, $db, $psl, $message;
  
   /*
    * CONSTRUCTORS
    */
   function Infolog () {
     global $_PSL;

     $this->psl = $_PSL;
     $this->message = '';

     /* Start a db */
     $this->db = pslNew("slashDB");

     /* Templates */
     $this->templ = pslNew("slashTemplate",$this->psl['templatedir']);
     $this->templ->debug = 0;
     $this->templ->set_file(array(
       infolog  => "infolog.tpl"
     ));
   }

   /*
    * METHODS
    */

   function pageOut() {

     $this->templ->set_block("infolog","row","rows");
     $this->db->query("SELECT * FROM psl_infolog");
     while ($this->db->next_record()) {
        $this->templ->set_var(array(
           'ACTION_URL'   => $this->psl['phpself'],
           'INFOLOG_ID'   => $this->db->Record['id'],
           'INFOLOG_TIME' => psl_dateTimeShort($this->db->Record['date_created']),
           'INFOLOG_DESC' => $this->db->Record['description'],
           'INFOLOG_DATA' => $this->db->Record['data']
        ));
     $this->templ->parse("rows","row",true);
     }
     $this->templ->set_var(array(
        ACTION_URL   =>  $this->psl['phpself']
     ));        
     return $this->templ->parse(OUT,array("infolog"));
     // $this->templ->p(OUT);
   }

   function deleteAllLogs() {
      $this->message .=  pslgetText('Deleting all log entries....');
      $this->db->query("DELETE FROM psl_infolog");
      $this->message .=  pslgetText("Done!")."<br>\n";
      return true;
   }

   function deleteLogByKeyword($keyword) {
      $keyword = clean($keyword);
      $this->db->query("DELETE from psl_infolog 
                         WHERE description RLIKE '($keyword.*)'");
      $this->message .= 'Deleted ' . $this->db->affected_rows() . " log entries with keyword the keyword \"$keyword\".<br>\n";
      logwrite("Infolog Record Delete", "Keyword: $keyword ($this->db->affected_rows() matched and deleted)");
      return true;
   }

   function deleteLogByID($id) {
      while( list( $key, $val) = each( $id )) {
         $this->message .= pslgetText("Deleting log entry ")."$val...";
         $this->db->query("DELETE FROM psl_infolog WHERE id='$val'");
         $this->message .= pslgetText("Done!")."<br>\n";
      }
      logwrite("Infolog Record Delete", $id);
      return true;
   }

   /**
   * getMessage - returns message text
   *
   * simply returns the contents of the message variable
   * 
   * @access public 
   */
   function getMessage() {
      return pslgetText($this->message);
   }


} /* end Infolog.class */

?>

--- NEW FILE: admin.php ---
<?php
// $Id: admin.php,v 1.1 2004/09/15 23:31:47 joestewart Exp $ 

global $_PSL, $sess, $auth, $perm;

AddClassRequirement("infolog",$_PSL['moduledir']  ."/infolog/Infolog.class");

// Header title
$pagetitle = pslgetText("Administration");

// Defines The META TAG Page Type
$xsiteobject = pslgetText("Administration");

/*****************************
     START OF PAGE
*****************************/
$auth->login_if(!$perm->have_perm('infologList'));

$log = pslNew("Infolog");

/* START DEBUG */

// debug( "HTTP_POST_VARS" , $HTTP_POST_VARS);
// debug( "HTTP_GET_VARS" , $HTTP_GET_VARS);

/* END DEBUG */

$content = '';

if ($perm->have_perm("infologList")) {
   switch ($HTTP_POST_VARS['submit']) {
      case "IdDelete":
         // debug("loginfoadmin::infolog_ary", $infolog_ary);
         if($log->deleteLogByID(clean($HTTP_POST_VARS["infolog_ary"]))) {
	    $content .= getMessage($log->getMessage());
	 }
         $content .= $log->pageOut();
         break;
      case "keyDelete":
         if($log->deleteLogByKeyword(clean($HTTP_POST_VARS["infolog_delete_key"]))) {
	    $content .= getMessage($log->getMessage());
	 }
         $content .= $log->pageOut();
         break;
      case "allDelete":
         if($log->deleteAllLogs()) {
            $content .= getMessage($log->getMessage());
	 }
         $content .= $log->pageOut();
         break;
      default:
         $content .= $log->pageOut();
   }
} else {
   $content = getTitlebar("100%","Error! Invalid Privileges");
   $content .= "Sorry. You do not have the necessary privilege to view this page.";
}

return $content;

?>

[Phpslash-commit] CVS: phpslash-dev/include/modules/infolog - New directory

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/infolog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11465/infolog

Log Message:
Directory /cvsroot/phpslash/phpslash-dev/include/modules/infolog added to the repository

[Phpslash-commit] CVS: phpslash-dev/include/modules/variable - New directory

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/variable
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11321/variable

Log Message:
Directory /cvsroot/phpslash/phpslash-dev/include/modules/variable added to the repository

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.97,1.98

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10871/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
removed classes that already had been moved to module directories.  moved Infolog and slashAuth to module directories.

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** CHANGES	13 Sep 2004 23:35:22 -0000	1.97
--- CHANGES	15 Sep 2004 23:19:35 -0000	1.98
***************
*** 13,16 ****
--- 13,20 ----
   9 - Removal of something (kill -9 :)
  
+ 2004-September 15 Joe Stewart <joe...@us...
+ [W] - removed classes that already had been moved to module directories.
+       moved Infolog and slashAuth to module directories.
+ 
  2004-September 13 Joe Stewart <joe...@us...
  [B] - backend.php - Add class requirements.

[Phpslash-commit] CVS: phpslash-dev/public_html config-dist.ini.php,1.13,1.14 config-dist.php,1.23,1.24 config_setup.ini.php,1.9,1.10

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10666/phpslash-dev/public_html

Modified Files:
	config-dist.ini.php config-dist.php config_setup.ini.php 
Log Message:
removed classes that already had been moved to module directories.  moved Infolog and slashAuth to module directories.

Index: config-dist.ini.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** config-dist.ini.php	6 Sep 2004 01:38:30 -0000	1.13
--- config-dist.ini.php	15 Sep 2004 23:18:39 -0000	1.14
***************
*** 532,543 ****
  Topic = topic
  ;; Allow administrators to view the informational log
! Infolog = true
  ;; Allow administrators to create/modify/delete authors
  Author = author
  ;; Allow administrators to modify site variables
! ;; (Not sure how much this is used)
! Variable = false
  ;; Allow administrators to create and modify user groups.
  Group = group
  ;; About page module.
  About = about
--- 532,545 ----
  Topic = topic
  ;; Allow administrators to view the informational log
! Infolog = infolog 
  ;; Allow administrators to create/modify/delete authors
  Author = author
  ;; Allow administrators to modify site variables
! ;; (Not used by phpSlash)
! ; Variable = variable 
  ;; Allow administrators to create and modify user groups.
  Group = group
+ ;; Authentication module
+ Auth = auth
  ;; About page module.
  About = about

Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** config-dist.php	8 Sep 2004 19:17:31 -0000	1.23
--- config-dist.php	15 Sep 2004 23:18:39 -0000	1.24
***************
*** 279,291 ****
  addClassRequirement("slashSess","session");
  addClassRequirement("slashSess",$_PSL['classdir'] . "/slashSess.class");
! addClassRequirement("slashAuth_base",$_PSL['classdir'] . "/slashAuth.class");
  AddClassRequirement("slashAuth","slashAuth_base");
! addClassRequirement("slashAuth",$_PSL['classdir'] . "/authtypes/slashAuth". $_PSL['auth.type'] .".class");
  addClassRequirement("slashPerm","perm");
  addClassRequirement("slashPerm",$_PSL['classdir'] . "/slashPerm.class");
  addClassRequirement("slashTemplate","template");
  addClassRequirement("slashTemplate",$_PSL['classdir'] . "/slashTemplate.class");
- // addClassRequirement("navbar",$_PSL['classdir'] . "/NavBar.class");
- // addClassRequirement("topicbar",$_PSL['classdir'] . "/TopicBar.class");
  addLibraryRequirement("phpslash",$_PSL['classdir'] . "/functions.inc");
  
--- 279,289 ----
  addClassRequirement("slashSess","session");
  addClassRequirement("slashSess",$_PSL['classdir'] . "/slashSess.class");
! addClassRequirement("slashAuth_base",$_PSL['moduledir'] ."/". $_PSL['module']['Auth'] ."/slashAuth.class");
  AddClassRequirement("slashAuth","slashAuth_base");
! addClassRequirement("slashAuth",$_PSL['moduledir'] ."/". $_PSL['module']['Auth']  ."/authtypes/slashAuth". $_PSL['auth.type'] .".class");
  addClassRequirement("slashPerm","perm");
  addClassRequirement("slashPerm",$_PSL['classdir'] . "/slashPerm.class");
  addClassRequirement("slashTemplate","template");
  addClassRequirement("slashTemplate",$_PSL['classdir'] . "/slashTemplate.class");
  addLibraryRequirement("phpslash",$_PSL['classdir'] . "/functions.inc");
  
***************
*** 897,905 ****
   * Rest of the class information
   **/
! // AddClassRequirement("comment",$_PSL['classdir'] . "/Comment.class");
! // AddClassRequirement("group",$_PSL['classdir'] . "/Group.class");
! AddClassRequirement("infolog",$_PSL['classdir'] . "/Infolog.class");
! // AddClassRequirement("navbar",$_PSL['classdir'] . "/NavBar.class");
! // AddClassRequirement("topicbar",$_PSL['classdir'] . "/TopicBar.class");
  AddClassRequirement("tz",$_PSL['classdir'] . "/tz.class");
  AddLibraryRequirement("tz",$_PSL['classdir'] . "/tz_functions.inc");
--- 895,899 ----
   * Rest of the class information
   **/
! AddClassRequirement("infolog",$_PSL['moduledir'] ."/". $_PSL['module']['Infolog'] . "/Infolog.class");
  AddClassRequirement("tz",$_PSL['classdir'] . "/tz.class");
  AddLibraryRequirement("tz",$_PSL['classdir'] . "/tz_functions.inc");

Index: config_setup.ini.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.ini.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config_setup.ini.php	6 Sep 2004 01:38:30 -0000	1.9
--- config_setup.ini.php	15 Sep 2004 23:18:39 -0000	1.10
***************
*** 532,543 ****
  Topic = topic
  ;; Allow administrators to view the informational log
! Infolog = true
  ;; Allow administrators to create/modify/delete authors
  Author = author
  ;; Allow administrators to modify site variables
! ;; (Not sure how much this is used)
! Variable = false
  ;; Allow administrators to create and modify user groups.
  Group = group
  ;; About page module.
  About = about
--- 532,545 ----
  Topic = topic
  ;; Allow administrators to view the informational log
! Infolog = infolog 
  ;; Allow administrators to create/modify/delete authors
  Author = author
  ;; Allow administrators to modify site variables
! ;; (Not used by phpSlash)
! ; Variable = variable 
  ;; Allow administrators to create and modify user groups.
  Group = group
+ ;; Authentication module
+ Auth = auth
  ;; About page module.
  About = about

[Phpslash-commit] CVS: phpslash-dev/public_html/admin infologAdmin.php,1.1.1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10666/phpslash-dev/public_html/admin

Modified Files:
	infologAdmin.php 
Log Message:
removed classes that already had been moved to module directories.  moved Infolog and slashAuth to module directories.

Index: infologAdmin.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/admin/infologAdmin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** infologAdmin.php	12 Mar 2003 16:12:57 -0000	1.1.1.1
--- infologAdmin.php	15 Sep 2004 23:18:39 -0000	1.2
***************
*** 1,120 ****
  <?php
! // $Id$ 
! 
! require("config.php");
  
! // Header title
! $pagetitle = pslgetText("Administration");
  
! // Defines The META TAG Page Type
! $xsiteobject = pslgetText("Administration");
  
! if (!is_object($sess)) {
!    page_open($_PSL['page_features']);
  }
  
! $log = pslNew("Infolog");
! 
! /*****************************
!      START OF PAGE
! *****************************/
! $auth->login_if(!$perm->have_perm('infologList'));
! 
! /* START DEBUG */
! 
! // debug( "HTTP_POST_VARS" , $HTTP_POST_VARS);
! // debug( "HTTP_GET_VARS" , $HTTP_GET_VARS);
  
! /* END DEBUG */
  
! $content = '';
  
! if ($perm->have_perm("infologList")) {
!    switch ($HTTP_POST_VARS['submit']) {
!       case "IdDelete":
!          // debug("loginfoadmin::infolog_ary", $infolog_ary);
!          if($log->deleteLogByID(clean($HTTP_POST_VARS["infolog_ary"]))) {
! 	    $content .= getMessage($log->getMessage());
! 	 }
!          $content .= $log->pageOut();
!          break;
!       case "keyDelete":
!          if($log->deleteLogByKeyword(clean($HTTP_POST_VARS["infolog_delete_key"]))) {
! 	    $content .= getMessage($log->getMessage());
! 	 }
!          $content .= $log->pageOut();
!          break;
!       case "allDelete":
!          if($log->deleteAllLogs()) {
!             $content .= getMessage($log->getMessage());
! 	 }
!          $content .= $log->pageOut();
!          break;
!       default:
!          $content .= $log->pageOut();
!    }
! } else {
!    $content = getTitlebar("100%","Error! Invalid Privileges");
!    $content .= "Sorry. You do not have the necessary privilege to view this page.";
! }
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
  $block = pslNew("Block_i");
- $ary['section'] = "Admin";
-  
- // $breadcrumb = breadcrumb($ary);
- 
- $_PSL['metatags']['object'] = $xsiteobject;
- 
- slashhead($pagetitle,$_PSL['metatags']);
- 
- $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";
-    } else {
-          $tplfile = 'index2colright.tpl';
-    }
- } elseif (empty($rightblocks)) {
-    $tplfile = 'index2colleft.tpl';
- } else {
-    $tplfile = 'index3col.tpl';
- }
- 
- $template = pslNew("slashTemplate",$_PSL['templatedir']);
- $template->debug = 0;
- $template->set_file(array(
-    'index'  => $tplfile //"index3col.tpl"
- ));
  
! if( !empty($GLOBALS['QUERY_STRING'])) {
!    $QUERY_STRING = '?'.$GLOBALS['QUERY_STRING'];
! } else {
!    $QUERY_STRING = '';
! }
!  
! $template->set_var(array(
!    'QUERYSTRING'  => $QUERY_STRING,
!    'ROOTDIR'      => $_PSL['rooturl'],
!    'IMAGEDIR'     => $_PSL['imageurl'],
!    'BREADCRUMB'   => $breadcrumb,
!    'STORY_COLUMN' => $content,
!    'LEFT_BLOCK_COLUMN'    => $leftblocks,
!    'CENTER_BLOCK_COLUMN'  => $centerblocks,
!    'RIGHT_BLOCK_COLUMN'   => $rightblocks
! ));
! 
! $template->parse('OUT','index');
! $template->p('OUT');
  
- slashfoot();
  page_close();
- 
- 
  ?>
--- 1,31 ----
  <?php
! // $Id$
  
! require('config.php');
  
! $pagetitle   = pslgetText('Infolog') .' '. pslgetText('Administration');     // The name to be displayed in the header
! $xsiteobject = pslgetText('Infolog') .' '. pslgetText('Administration Page'); // This Defines The META Tag Object Type
  
! if(!empty($HTTP_GET_VARS['login'])) {
!   $auth->login_if($HTTP_GET_VARS['login']);
  }
  
! $_PSL['metatags']['object'] = $xsiteobject;
  
! // Objects
  
! $ary['module'] = 'Infolog';
  
! $ary['section'] = 'Admin';
! $ary['page'] = 'admin';
  
  // setup the block module   
  $_PSL['module']['module.current'] = $_PSL['module']['Block'];
! $content = include($_PSL['moduledir'] ."/". $_PSL['module']['module.current'] ."/index.php");
  $block = pslNew("Block_i");
  
! //show Page
! echo $content;
  
  page_close();
  ?>

[Phpslash-commit] CVS: phpslash-dev/include/class Comment.class,1.1.1.1,NONE Group.class,1.1.1.1,NONE Infolog.class,1.1.1.1,NONE NavBar.class,1.2,NONE TopicBar.class,1.1.1.1,NONE Variable.class,1.1.1.1,NONE

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10666/phpslash-dev/include/class

Removed Files:
	Comment.class Group.class Infolog.class NavBar.class 
	TopicBar.class Variable.class 
Log Message:
removed classes that already had been moved to module directories.  moved Infolog and slashAuth to module directories.

--- Comment.class DELETED ---

--- Group.class DELETED ---

--- Infolog.class DELETED ---

--- NavBar.class DELETED ---

--- TopicBar.class DELETED ---

--- Variable.class DELETED ---

[Phpslash-commit] CVS: phpslash-dev/public_html backend.php,1.1.1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22556/phpslash-dev/public_html

Modified Files:
	backend.php 
Log Message:
Add class requirements.

Index: backend.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/backend.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** backend.php	12 Mar 2003 16:12:56 -0000	1.1.1.1
--- backend.php	13 Sep 2004 23:35:24 -0000	1.2
***************
*** 54,57 ****
--- 54,62 ----
  }
  
+ AddClassRequirement("story_base",$_PSL['moduledir'] . "/story/Story_base.class");
+ AddClassRequirement("story","story_base");
+ AddClassRequirement("story",$_PSL['moduledir'] . "/story/Story.class");
+ AddClassRequirement("story_plugin_i",$_PSL['moduledir'] ."/". $_PSL['module']['Story'] ."/Story_plugin_i.class");
+ 
  // Object Creation
  $story = pslNew("Story");

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.96,1.97

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22556/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
Add class requirements.

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** CHANGES	11 Sep 2004 14:48:57 -0000	1.96
--- CHANGES	13 Sep 2004 23:35:22 -0000	1.97
***************
*** 13,16 ****
--- 13,19 ----
   9 - Removal of something (kill -9 :)
  
+ 2004-September 13 Joe Stewart <joe...@us...
+ [B] - backend.php - Add class requirements.
+ 
  2004-09-11 10:46 EDT Luis Mondesi <le...@ho...> 
  [B] - include/class/jpcache/type/file.php - added check for JPCACHE_DIR

[Phpslash-commit] CVS: phpslash-dev ChangeLog,1.8,1.9

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27221

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	8 Sep 2004 20:19:58 -0000	1.8
--- ChangeLog	11 Sep 2004 15:10:18 -0000	1.9
***************
*** 1,2609 ****
! 2004-09-08 15:09  joestewart
  
! 	* include/templates/en/ShankZen/slashHead-htmlarea3.tpl: removed
! 	  border and stylesheet that peterc removed
  
! 2004-09-08 15:07  joestewart
  
  	* tables/0.8/slash-all.sql: Admin Header Block
  
! 2004-09-08 14:17  joestewart
[...4863 lines suppressed...]
! 	public_html/images/topics/topicquickies.gif,
! 	public_html/images/topics/topicredhat.gif,
! 	public_html/images/topics/topicscience.gif,
! 	public_html/images/topics/topicsgi.gif,
! 	public_html/images/topics/topicslashdot.gif,
! 	public_html/images/topics/topicspam.jpg,
! 	public_html/images/topics/topicstarwars.gif,
! 	public_html/images/topics/topicsun.gif,
! 	public_html/images/topics/topicsuse.gif,
! 	public_html/images/topics/topictech2.jpg,
! 	public_html/images/topics/topictv.jpg,
! 	public_html/images/topics/topicunix.jpg,
! 	public_html/images/topics/topicus.gif,
! 	public_html/images/topics/topicwine.gif,
! 	public_html/images/topics/topicx.jpg,
! 	public_html/images/topics/topicxmas.jpg,
! 	public_html/styles/basic.css, public_html/styles/xhtmlb.css,
! 	scripts/db_xfer.php3.disabled, scripts/url_test.php,
! 	tables/0.7/65_to_7.sql, tables/0.7/slash-all.sql: Initial revision
  

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.95,1.96

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23228

Modified Files:
	CHANGES 
Log Message:
added bugfix note about file.php jpcache support

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** CHANGES	9 Sep 2004 20:45:06 -0000	1.95
--- CHANGES	11 Sep 2004 14:48:57 -0000	1.96
***************
*** 13,16 ****
--- 13,20 ----
   9 - Removal of something (kill -9 :)
  
+ 2004-09-11 10:46 EDT Luis Mondesi <le...@ho...> 
+ [B] - include/class/jpcache/type/file.php - added check for JPCACHE_DIR
+      and attempts to create one if it doesn't exist.
+ 
  2004-September 9 Joe Stewart <joe...@us...
  [B] - story/index.php - returned "Email This Story".

[Phpslash-commit] CVS: phpslash-dev/include/class/jpcache/type file.php,1.1.1.1,1.2

[Luis M <le...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/class/jpcache/type
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22623

Modified Files:
	file.php 
Log Message:
added a check for the JPCACHE_DIR. If this doesn't exist, then we attempt to create it using php4's mkdir(). Note that mkdir won't try to recursively make the directories needed to reach this path

Index: file.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/class/jpcache/type/file.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** file.php	12 Mar 2003 16:12:51 -0000	1.1.1.1
--- file.php	11 Sep 2004 14:45:24 -0000	1.2
***************
*** 223,228 ****
       */
      function jpcache_do_start()
!     {  
!         // Add additional code you might require
      }
  
--- 223,242 ----
       */
      function jpcache_do_start()
!     {
!         if ( ! is_dir( $GLOBALS["JPCACHE_DIR"] ) )
!         {
!             /* Attempt to create the JPCACHE_DIR 
!             * Note that this won't recursively make
!             * the necessary directories to reach this path
!             * (as would the UNIX command "mkdir -p").
!             * This functionality was added in PHP 5.
!             * TODO check if we are running php5 and call: 
!             *   mkdir($GLOBALS["JPCACHE_DIR"],0700,true).
!             * This way all directories prior to the directory
!             * we are making will be created as well.
!             * Else we should fall back to php4's way.
!             */
!             mkdir($GLOBALS["JPCACHE_DIR"],0700);
!         }
      }
  

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.94,1.95

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3660/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
returned "Email This Story".

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** CHANGES	9 Sep 2004 18:59:36 -0000	1.94
--- CHANGES	9 Sep 2004 20:45:06 -0000	1.95
***************
*** 14,17 ****
--- 14,20 ----
  
  2004-September 9 Joe Stewart <joe...@us...
+ [B] - story/index.php - returned "Email This Story".
+ 
+ 2004-September 9 Joe Stewart <joe...@us...
  [B] - config_setup.php - populate empty database.
  

[Phpslash-commit] CVS: phpslash-dev/include/templates/en/basic articleEmailForm.tpl,1.1.1.1,1.2 articleEmailSent.tpl,1.1.1.1,1.2

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/templates/en/basic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3586/phpslash-dev/include/templates/en/basic

Modified Files:
	articleEmailForm.tpl articleEmailSent.tpl 
Log Message:
returned "Email This Story".

Index: articleEmailForm.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/articleEmailForm.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** articleEmailForm.tpl	12 Mar 2003 16:12:52 -0000	1.1.1.1
--- articleEmailForm.tpl	9 Sep 2004 20:44:55 -0000	1.2
***************
*** 9,13 ****
          <tr>

            <td class="titleBar">

!             Email this Story to a Friend

            </td>

          </tr>

--- 9,13 ----
          <tr>

            <td class="titleBar">

!             <h5>Email this Story to a Friend</h5>

            </td>

          </tr>


Index: articleEmailSent.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/templates/en/basic/articleEmailSent.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** articleEmailSent.tpl	12 Mar 2003 16:12:52 -0000	1.1.1.1
--- articleEmailSent.tpl	9 Sep 2004 20:44:56 -0000	1.2
***************
*** 9,13 ****
          <tr>

            <td class="titleBar">

!             Email this Story to a Friend

            </td>

          </tr>

--- 9,13 ----
          <tr>

            <td class="titleBar">

!             <h5>Email this Story to a Friend</h5>

            </td>

          </tr>

[Phpslash-commit] CVS: phpslash-dev/include/modules/story index.php,1.7,1.8

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/story
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3586/phpslash-dev/include/modules/story

Modified Files:
	index.php 
Log Message:
returned "Email This Story".

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php	11 Nov 2003 22:11:11 -0000	1.7
--- index.php	9 Sep 2004 20:44:54 -0000	1.8
***************
*** 14,20 ****
  $story = pslNew("Story");
  
! if(array_key_exists('story_id', $ary)) { 
     // one particular story requested	
!    $content = $story->getStory($ary['story_id'], "full", $ary);
  } else {
     // otherwise show stories for the section
--- 14,30 ----
  $story = pslNew("Story");
  
! $content = '';
! 
! if(array_key_exists('story_id', $ary)) {
!    if(array_key_exists('submit',$ary)) {
!       switch($ary['submit']) {
!       
!          case 'email':
!             $content .=  $story->emailStory($ary['story_id'], $ary['action']);
!             break;
!       }
!    }
     // one particular story requested	
!    $content .= $story->getStory($ary['story_id'], "full", $ary);
  } else {
     // otherwise show stories for the section

[Phpslash-commit] CVS: phpslash-dev/public_html config_setup.php,1.9,1.10

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13433/phpslash-dev/public_html

Modified Files:
	config_setup.php 
Log Message:
setup wizard can populate existing database

Index: config_setup.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** config_setup.php	1 Sep 2004 20:21:49 -0000	1.9
--- config_setup.php	9 Sep 2004 18:59:36 -0000	1.10
***************
*** 685,697 ****
      	$tableAlreadyExists = true;
  }
  if (!$tableAlreadyExists) {
  ?>
      <tr>
          <td colspan=2>
!     <?php print PRODUCT;?> needs to have the database configured before it can run. It 
  will create a database named <tt><?php print $vars['DB_Database']?></tt>. Fill 
  in the 
  following information to allow <?php print PRODUCT;?> to create that database and 
  the necessary tables inside of it. 
       </td>
      </td>
--- 685,734 ----
      	$tableAlreadyExists = true;
  }
+ $result = true;
+ if($tableAlreadyExists) {
+   /* Use the database */
+   $result = mysql_query(
+             "USE " . mysql_escape_string($vars['DB_Database'])
+   );
+   if (mysql_errno() != 0) {
+      _setError(
+          "Could use database " . $vars['DB_Database'] . " as " 
+          . $user['name'] . ' (pass: "' . $user['pass'] .'") -- Server said '
+          . mysql_error(),
+          __LINE__
+      );
+      return STEP_ERROR;
+   }
+ 
+ 
+   $result = mysql_query(
+      "SELECT id FROM psl_block_type where name = 'page' "
+   );
+ 
+   if (!$result) {
+      $tableAlreadyExists = false;
+   }
+ 
+ }
  if (!$tableAlreadyExists) {
  ?>
      <tr>
          <td colspan=2>
!     <?php 
!     if($result) {
!        print PRODUCT;?> needs to have the database configured before it can run. It 
  will create a database named <tt><?php print $vars['DB_Database']?></tt>. Fill 
  in the 
  following information to allow <?php print PRODUCT;?> to create that database and 
  the necessary tables inside of it. 
+      <?php
+      } else {
+         print PRODUCT;?> needs to have the database configured before it can run. It 
+ will use the database named <tt><?php print $vars['DB_Database']?></tt>. Fill 
+ in the 
+ following information to allow <?php print PRODUCT;?> to use that database and create 
+ the necessary tables inside of it. 
+      <?php
+      } ?>
       </td>
      </td>
***************
*** 703,717 ****
      <tr>
          <td colspan=2>
              Enter the name and password of a database user that has a 
              sufficient access level to create a database, and then create
              tables inside of it. 
!             
!             <P>
!             If you already have a database set up and 
!             do not need to create a new one leave this blank.
!             
              <p>
!             This information will <i>not</i> be stored after the database has 
!             been created. 
              <table align="center">
                  <tr class="setVal" valign="top">
--- 740,754 ----
      <tr>
          <td colspan=2>
+ 	    <?php if($result) { ?>
              Enter the name and password of a database user that has a 
              sufficient access level to create a database, and then create
              tables inside of it. 
!             <?php } else { ?>
!             Enter the name and password of a database user that has a 
!             sufficient access level to use the database, and then create
!             tables inside of it. 
! 	    <?php } ?>
              <p>
!             This information will <i>not</i> be stored after this program has completed. 
              <table align="center">
                  <tr class="setVal" valign="top">
***************
*** 737,740 ****
--- 774,780 ----
      </td> 
      </table>
+     <? if(!$result) {
+        echo "<input type=\"hidden\" name=\"do_not_create\" value=\"alreadyExists\">";
+     } ?>
      <input type="submit" value="Set values">
      </form>

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.93,1.94

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13433/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
setup wizard can populate existing database

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** CHANGES	8 Sep 2004 19:17:31 -0000	1.93
--- CHANGES	9 Sep 2004 18:59:36 -0000	1.94
***************
*** 13,16 ****
--- 13,19 ----
   9 - Removal of something (kill -9 :)
  
+ 2004-September 9 Joe Stewart <joe...@us...
+ [B] - config_setup.php - populate empty database.
+ 
  2004-September 8 Joe Stewart <joe...@us...
  [FB] - login.php - corrected login bug introduced 8/30.

[Phpslash-commit] CVS: phpslash-dev ChangeLog,1.7,1.8

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8633/phpslash-dev

Modified Files:
	ChangeLog 
Log Message:
updating Changelog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	1 Sep 2004 19:46:21 -0000	1.7
--- ChangeLog	8 Sep 2004 20:19:58 -0000	1.8
***************
*** 1,2 ****
--- 1,130 ----
+ 2004-09-08 15:09  joestewart
+ 
+ 	* include/templates/en/ShankZen/slashHead-htmlarea3.tpl: removed
+ 	  border and stylesheet that peterc removed
+ 
+ 2004-09-08 15:07  joestewart
+ 
+ 	* tables/0.8/slash-all.sql: Admin Header Block
+ 
[...2194 lines suppressed...]
! 	  include/templates/en/muggles/skin.ini,
! 	  include/templates/en/muggles/slashFoot.tpl,
! 	  include/templates/en/winxp/about.tpl,
! 	  include/templates/en/winxp/commentSubmitForm.tpl,
! 	  include/templates/en/winxp/fancybox.tpl,
! 	  include/templates/en/winxp/glossarySearch.tpl,
! 	  include/templates/en/winxp/index2colright.tpl,
! 	  include/templates/en/winxp/mailinglistForm.tpl,
! 	  include/templates/en/winxp/navbar.tpl,
! 	  include/templates/en/winxp/pollList.tpl,
! 	  include/templates/en/winxp/pollResultPage.tpl,
! 	  include/templates/en/winxp/searchPage.tpl,
! 	  include/templates/en/winxp/skin.ini,
! 	  include/templates/en/winxp/slashFoot.tpl,
! 	  include/templates/en/winxp/slashHead.tpl,
! 	  include/templates/en/winxp/story.tpl,
! 	  include/templates/en/winxp/storyIndex.tpl,
! 	  include/templates/en/winxp/submissionForm.tpl,
! 	  include/templates/en/winxp/titlebar.tpl: Initial revision
  

[Phpslash-commit] CVS: phpslash-skins/include/templates/en/ShankZen slashHead-htmlarea3.tpl,1.6,1.7

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6606/phpslash-skins/include/templates/en/ShankZen

Modified Files:
	slashHead-htmlarea3.tpl 
Log Message:
removed border and stylesheet that peterc removed

Index: slashHead-htmlarea3.tpl
===================================================================
RCS file: /cvsroot/phpslash/phpslash-skins/include/templates/en/ShankZen/slashHead-htmlarea3.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** slashHead-htmlarea3.tpl	2 Sep 2004 17:32:14 -0000	1.6
--- slashHead-htmlarea3.tpl	8 Sep 2004 20:09:06 -0000	1.7
***************
*** 16,20 ****
  <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
  <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
! <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style>
  <!-- BEGIN HTMLAREA3 Javascript -->
  
--- 16,20 ----
  <link rel="alternate" type="application/rss+xml" title="RSS" href="{ROOTDIR}/backend.php3" />
  <link rel="stylesheet" type="text/css" href="{ROOTDIR}/styles/{SKIN}.css" />
! <!-- <style type="text/css" media="screen">@import "{ROOTDIR}/styles/{SKIN}_ext.css";</style> -->
  <!-- BEGIN HTMLAREA3 Javascript -->
  
***************
*** 235,239 ****
        <div style="vertical-align:bottom">
           <div class="psl-logo">
!          <a href="{ROOTDIR}"><img src="{IMAGEDIR}/topics/topicphpslash.gif" alt="{SITE_NAME}" width="100" height="40"/></a>
           </div>
           <div class="psl-title">
--- 235,239 ----
        <div style="vertical-align:bottom">
           <div class="psl-logo">
!          <a href="{ROOTDIR}"><img src="{IMAGEDIR}/topics/topicphpslash.gif" alt="{SITE_NAME}" border="0" width="100" height="40"/></a>
           </div>
           <div class="psl-title">

[Phpslash-commit] CVS: phpslash-dev/tables/0.8 slash-all.sql,1.7,1.8

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/tables/0.8
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6418/phpslash-dev/tables/0.8

Modified Files:
	slash-all.sql 
Log Message:
Admin Header Block

Index: slash-all.sql
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/tables/0.8/slash-all.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** slash-all.sql	6 Sep 2004 01:34:29 -0000	1.7
--- slash-all.sql	8 Sep 2004 20:07:59 -0000	1.8
***************
*** 214,218 ****
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,1,'Administration',0,'','','<p>A bunch of cool things like latest site activity and stats should go here.  </p>\n <p>But until they do, just pick something from the NavBar and go about your duties...</p>\n','a:3:{s:6:\"column\";s:6:\"center\";s:5:\"perms\";s:4:\"user\";s:0:\"\";s:0:\"\";}',90,1025284604);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks',0,'','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,1025284618);
! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (150,15,'Page - public - header',0,'','','','a:4:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";s:3:\"tpl\";s:19:\"slashHead-htmlarea3\";}',95,NULL);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (151,16,'Page - public - footer',0,'','','','a:3:{s:6:\"column\";s:6:\"bottom\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";}',5,NULL);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (152,17,'Page - public - topicbar',1200,'','','','a:3:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";}',80,1051719382);
--- 214,218 ----
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (148,1,'Administration',0,'','','<p>A bunch of cool things like latest site activity and stats should go here.  </p>\n <p>But until they do, just pick something from the NavBar and go about your duties...</p>\n','a:3:{s:6:\"column\";s:6:\"center\";s:5:\"perms\";s:4:\"user\";s:0:\"\";s:0:\"\";}',90,1025284604);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (149,12,'Tasks',0,'','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,1025284618);
! INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (150,15,'Page - public - header',0,'','','','a:3:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:4:\"100%\";s:8:\"box_type\";s:11:\"contentonly\";}',95,NULL);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (151,16,'Page - public - footer',0,'','','','a:3:{s:6:\"column\";s:6:\"bottom\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";}',5,NULL);
  INSERT INTO psl_block (id, type, title, expire_length, location, source_url, cache_data, block_options, ordernum, date_issued) VALUES (152,17,'Page - public - topicbar',1200,'','','','a:3:{s:6:\"column\";s:3:\"top\";s:5:\"width\";s:0:\"\";s:8:\"box_type\";s:11:\"contentonly\";}',80,1051719382);

[Phpslash-commit] CVS: phpslash-dev/include/modules/story/plugins Story_plugin_mssmartquotes.class,NONE,1.1

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/story/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29153/phpslash-dev/include/modules/story/plugins

Added Files:
	Story_plugin_mssmartquotes.class 
Log Message:
added story plugin to remove MS Smart Quotes

--- NEW FILE: Story_plugin_mssmartquotes.class ---
<?php

/* Story_plugin_mssmartquotes.class -> Methods for phpslash specfic story plugins */
/* $Id: Story_plugin_mssmartquotes.class,v 1.1 2004/09/08 19:17:31 joestewart Exp $ */


class Story_plugin_mssmartquotes extends Story_plugin_i {

   /* constructor */
   function Story_plugin_mssmartquotes() {
      $this->Story_plugin_i();
      
      $this->type = "mssmartquotes";  /* set the 'type' */
      $this->description = "A plugin that returns the story with MS Smart Quotes converted to html entities"; 
   }

   function parse($ary) {

      // convert CR to linebreaks
      $ary['intro_text'] = $this->superhtmlentities($ary['intro_text']);
      $ary['body_text'] = $this->superhtmlentities($ary[body_text]);

      $this->output = $ary;
      return true;
      
   }

   function superhtmlentities($text) {
        $entities = array(128 => 'euro', 
	                  130 => 'sbquo', 
			  131 => 'fnof', 
			  132 => 'bdquo', 
			  133 => 'hellip', 
			  134 => 'dagger', 
			  135 => 'Dagger', 
			  136 => 'circ', 
			  137 => 'permil', 
			  138 => 'Scaron', 
			  139 => 'lsaquo', 
			  140 => 'OElig', 
			  145 => 'lsquo', 
			  146 => 'rsquo', 
			  147 => 'ldquo', 
			  148 => 'rdquo', 
			  149 => 'bull', 
			  150 => '#45', 
			  151 => 'mdash', 
			  152 => 'tilde', 
			  153 => 'trade', 
			  154 => 'scaron', 
			  155 => 'rsaquo', 
			  156 => 'oelig', 
			  159 => 'Yuml');
        $new_text = '';
        for($i = 0; $i < strlen($text); $i++) {
                $num = ord($text{$i});
                if (array_key_exists($num, $entities)) {
                        switch ($num) {
                                case 150:
                                        $new_text .= '-';
                                        break;
                                default:
                                        $new_text .= '&'.$entities[$num].';';
                        }
                }
                else
                        if($num < 127 || $num > 159) {
                                $new_text .= htmlentities($text{$i});
                        }
        }
        return $new_text;
   }   
}

?>

[Phpslash-commit] CVS: phpslash-dev CHANGES,1.92,1.93

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29153/phpslash-dev

Modified Files:
	CHANGES 
Log Message:
added story plugin to remove MS Smart Quotes

Index: CHANGES
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/CHANGES,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** CHANGES	6 Sep 2004 01:34:29 -0000	1.92
--- CHANGES	8 Sep 2004 19:17:31 -0000	1.93
***************
*** 13,16 ****
--- 13,22 ----
   9 - Removal of something (kill -9 :)
  
+ 2004-September 8 Joe Stewart <joe...@us...
+ [FB] - login.php - corrected login bug introduced 8/30.
+       Story_plugin_mssmartquotes.class - story plugin to remove
+       MS Smart Quotes (untested).
+       config-dist.php.
+ 
  2004-September 5 Joe Stewart <joe...@us...
  [F] - db_xfer.php.disabled, slash-all.sql, config-dist.php, config-dist.ini.php,

[Phpslash-commit] CVS: phpslash-dev/public_html config-dist.php,1.22,1.23 login.php,1.4,1.5

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29153/phpslash-dev/public_html

Modified Files:
	config-dist.php login.php 
Log Message:
added story plugin to remove MS Smart Quotes

Index: config-dist.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** config-dist.php	6 Sep 2004 01:34:30 -0000	1.22
--- config-dist.php	8 Sep 2004 19:17:31 -0000	1.23
***************
*** 1028,1031 ****
--- 1028,1032 ----
                                       'plaintext'=> 'Plain Text(Returns added)', 
                                       'exttrans' => 'Extended Translation(show html code)',
+                                      'mssmartquotes' => 'Convert MS Smart Quotes',
                                       'wiki'     => 'Wiki',
                                       'bbcode'   => 'BBCode')

Index: login.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/login.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** login.php	30 Aug 2004 15:27:50 -0000	1.4
--- login.php	8 Sep 2004 19:17:31 -0000	1.5
***************
*** 47,51 ****
  // old kludge for phplib to accept login from an external form such as the login block.  Will be removed. jvs - 02/18/2003 - 
  // If new auth had replaced existing phplib auth. 08/30/2004
! if(isset($HTTP_POST_VARS['username'])) { // this would be present if a login is in progress
        $auth->auth["uid"]= "form"; // this is what auth seems to want
        $auth->start();
--- 47,51 ----
  // old kludge for phplib to accept login from an external form such as the login block.  Will be removed. jvs - 02/18/2003 - 
  // If new auth had replaced existing phplib auth. 08/30/2004
! if(isset($_POST['username']) && !$perm->have_perm('user')) { // this would be present if a login is in progress
        $auth->auth["uid"]= "form"; // this is what auth seems to want
        $auth->start();

[Phpslash-commit] CVS: phpslash-dev/public_html config-dist.ini.php,1.12,1.13 config_setup.ini.php,1.8,1.9

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/public_html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16324/phpslash-dev/public_html

Modified Files:
	config-dist.ini.php config_setup.ini.php 
Log Message:
User Blog support

Index: config-dist.ini.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config-dist.ini.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** config-dist.ini.php	6 Sep 2004 01:34:30 -0000	1.12
--- config-dist.ini.php	6 Sep 2004 01:38:30 -0000	1.13
***************
*** 507,513 ****
  ;; headlines (the actual mailing is handled elsewhere; see the file
  ;; cronmail.php
! ;; MailingList = mailinglist
  ;; PHPlist
! Newsletters = phplist
  ;; Provide a container for small bits of HTML to be incorporated into
  ;; side columns of pages.
--- 507,513 ----
  ;; headlines (the actual mailing is handled elsewhere; see the file
  ;; cronmail.php
! MailingList = mailinglist
  ;; PHPlist
! ;Newsletters = phplist
  ;; Provide a container for small bits of HTML to be incorporated into
  ;; side columns of pages.

Index: config_setup.ini.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/public_html/config_setup.ini.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** config_setup.ini.php	6 Sep 2004 01:34:30 -0000	1.8
--- config_setup.ini.php	6 Sep 2004 01:38:30 -0000	1.9
***************
*** 507,513 ****
  ;; headlines (the actual mailing is handled elsewhere; see the file
  ;; cronmail.php
! ;; MailingList = mailinglist
  ;; PHPlist
! Newsletters = phplist
  ;; Provide a container for small bits of HTML to be incorporated into
  ;; side columns of pages.
--- 507,513 ----
  ;; headlines (the actual mailing is handled elsewhere; see the file
  ;; cronmail.php
! MailingList = mailinglist
  ;; PHPlist
! ; Newsletters = phplist
  ;; Provide a container for small bits of HTML to be incorporated into
  ;; side columns of pages.