phpslash-commit Mailing List for phpSlash (Page 86)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv31036/phpslash-ft/class

Modified Files:
	Block.class Block_i.class Block_admin.class 
Log Message:
block admin cleanup

Index: Block.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block.class,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Block.class	11 Mar 2002 16:19:09 -0000	1.13
--- Block.class	7 Jun 2002 16:24:04 -0000	1.14
***************
*** 85,91 ****
        $this->db->query("INSERT INTO psl_block_type (id, name) VALUES ('$id','$type')");
        if ($this->db->affected_rows != 1) {
!          echo "Block Type: $type added with an id of: $id";
        } else {
!          echo "Error entering $type!";
        }
     }
--- 85,93 ----
        $this->db->query("INSERT INTO psl_block_type (id, name) VALUES ('$id','$type')");
        if ($this->db->affected_rows != 1) {
!          $this->message = "Block Type: $type added with an id of: $id";
! 	 return true;
        } else {
!          $this->message = "Error entering $type!";
! 	 return false;
        }
     }
***************
*** 122,127 ****
           $go_ahead = false;
           $title =  $this->db->Record["title"];
!          echo "Sorry, this block_type($type_name) is assigned to this block:";
!          echo "<font color=\"red\">'$title'</font><br />\n";
        }

--- 124,129 ----
           $go_ahead = false;
           $title =  $this->db->Record["title"];
!          $this->message = "Sorry, this block_type($type_name) is assigned to this block:";
!          $this->message .= "<font color=\"red\">'$title'</font><br />\n";
        }

***************
*** 133,137 ****
                  WHERE name = '$type_name'";
           $this->db->query($q);
!          echo "<i>Block Type $type_name deleted</i>";

           return true;
--- 135,139 ----
                  WHERE name = '$type_name'";
           $this->db->query($q);
!          $this->message = "<i>Block Type $type_name deleted</i>";

           return true;
***************
*** 211,215 ****
           $optionval_ary = $block_array[optionval];

!          for( $i=1 ; $i <= count($block_array[optionname]) ; $i++) {
              if(  $optionname_ary[$i] != "") {
  	       $optname = $optionname_ary[$i];
--- 213,217 ----
           $optionval_ary = $block_array[optionval];

!          for( $i=0 ; $i < count($block_array[optionname]) ; $i++) {
              if(  $optionname_ary[$i] != "") {
  	       $optname = $optionname_ary[$i];
***************
*** 230,234 ****
           if ($block_array["block_id"] != "") {

!             echo "Updating Block " . $block_array["block_id"] . "<br>\n";

              $section_del = "DELETE FROM psl_section_block_lut
--- 232,236 ----
           if ($block_array["block_id"] != "") {

!             $this->message = "Updating Block " . $block_array["block_id"] . "<br>\n";

              $section_del = "DELETE FROM psl_section_block_lut
***************
*** 258,262 ****
           } else {

!             echo "Creating new block from submitted info.<br>\n";

              $block_array["block_id"] = generateID("psl_block_seq");
--- 260,264 ----
           } else {

!             $this->message = "Creating new block from submitted info.<br>\n";

              $block_array["block_id"] = generateID("psl_block_seq");
***************
*** 280,284 ****
                                    '$block_array[ordernum]',
                                    '$serial_opts')"; 
!             echo "Adding the block to the db...<br>\n";
              $this->db->query($query);

--- 282,286 ----
                                    '$block_array[ordernum]',
                                    '$serial_opts')"; 
!             $this->message .= "Adding the block to the db...<br>\n";
              $this->db->query($query);

***************
*** 299,318 ****
  	    }
           } else {
!             echo "No section chosen.  Block will not be displayed on site till a section is chosen for block:  <i>$block_array[block_title]</i><br>\n";
  	 }

!          echo "Checking db...<br>\n";
           if ($this->db->affected_rows() ==  1) {
!             echo "Here's a preview...<br>\n";
              # $testid = $block_array[block_id];
              # echo "<BR><BR><B>Before DoBlock!! -> $testid</B><BR><BR>\n";
              logwrite("Block Addition", "Added block " . $block_array['block_id']);
!             print $this->doBlock($block_array["block_id"]);
           } else {
!             echo "Error adding block.  Query returned multiple results.<br>";
           }
        } else {
!          echo "Block::putBlock() received data not in an array.<br>\n";
        }
     }

--- 301,323 ----
  	    }
           } else {
!             $this->message .= "No section chosen.  Block will not be displayed on site till a section is chosen for block:  <i>$block_array[block_title]</i><br>\n";
  	 }

!          $this->message .= "Checking db...<br>\n";
           if ($this->db->affected_rows() ==  1) {
!             // $this->message .= "Here's a preview...<br>\n";
              # $testid = $block_array[block_id];
              # echo "<BR><BR><B>Before DoBlock!! -> $testid</B><BR><BR>\n";
              logwrite("Block Addition", "Added block " . $block_array['block_id']);
!             $this->message .= $this->doBlock($block_array["block_id"]);
           } else {
!             $this->message .= "Error adding block.  Query returned multiple results.<br>";
! 	    return false;
           }
        } else {
!          $this->message = "Block::putBlock() received data not in an array.<br>\n";
! 	 return false;
        }
+       return $this->message;
     }

Index: Block_i.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_i.class,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Block_i.class	1 Jun 2002 15:52:35 -0000	1.18
--- Block_i.class	7 Jun 2002 16:24:04 -0000	1.19
***************
*** 148,162 ****
              $link = "";
           }
           if (is_array($ary['block_options'])) {
!             if (is_string($ary["block_options"]["width"])) {
!                $width = $ary["block_options"]["width"];
! 	    }
!             if (is_string($ary["block_options"]["box_type"])) {
!                $box_type = $ary["block_options"]["box_type"];
  	    }
           }
           // debug("Block_i.class::parseBlock::ary", $ary);

!          return getFancyBox($width, $temptitle,  $ary["cache_data"],$link, $box_type);
        }
     }
--- 148,199 ----
              $link = "";
           }
+ 	 
+ 	 $var_ary = "";
+ 	 
           if (is_array($ary['block_options'])) {
! 	    // remove column from array
! 	    unset($ary["block_options"]["column"]);
! 	    while( list( $key, $val) = @each( $ary["block_options"] )) {
!            
!                switch($key) {
!                   
! 		  case "width":
! 		     // pass width to getFancyBox
!                      $width = $ary["block_options"]["width"];
! 		     // remove width from array
! 		     $ary["block_options"]["width"] = '';
! 		     break;
! 		     
! 		  case "box_type":
! 		     // pass box_type to getFancyBox
! 		     $box_type = $ary["block_options"]["box_type"];
! 		     // remove box_type from array
! 		     $ary["block_options"]["box_type"] = '';
! 		     break;
! 
!                   case "perms":
! 		     // remove perms from array
! 		     $ary["block_options"]["perms"] = '';
! 		     break;
! 
! 		  default:
! 	             // pluggable user defined function
!                      if ($this->psl['block_options_udf'] != '') {
!                         $ary = $this->psl['block_options_udf']($key, $value, $ary);
!                      }
!                      // let the fancybox template parse any block options left over.
!                      $var_ary = array(strtoupper($key) => $ary['block_options'][$key]);
! 		     $ary['block_options'][$key] = '';
!                      // what is left over?
!                      // debug("block_options[$key]", $val);
!                      break;
!  
! 	       }
  	    }
+ 
           }
           // debug("Block_i.class::parseBlock::ary", $ary);

!          return getFancyBox($width, $temptitle,  $ary["cache_data"],$link, $box_type, $var_ary);
        }
     }

Index: Block_admin.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/Block_admin.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Block_admin.class	1 Jun 2002 16:14:03 -0000	1.1
--- Block_admin.class	7 Jun 2002 16:24:04 -0000	1.2
***************
*** 42,46 ****

        /* Start Template Object */
!       $this->templ = new Template($this->psl['templatedir']);
        $this->templ->debug = 0;

--- 42,46 ----

        /* Start Template Object */
!       $this->templ = new Template($this->psl['templatedir'], "remove");
        $this->templ->debug = 0;

***************
*** 69,74 ****
     function newBlock() {

-       titlebar("100%", "Create a New Block");
- 
        $ary = $this->getTypes();
        $this->templ->set_block("newblock","block_type_row","block_type_rows");
--- 69,72 ----
***************
*** 95,112 ****
           $this->templ->parse("section_rows","section_row",true);
        }
-       $this->templ->set_block("newblock","each_option", "options");
-       $blockcnt = $this->psl[block_optioncount];
-       for ($i =1; $i <= $blockcnt; $i++) {
-          $this->templ->set_var(array(
-             'OPTION_NAME'     => "optionname[$i]",
-             'OPTION_NAME_VAL' => "",
-             'OPTION_VALUE'    => "optionval[$i]",
-             'OPTION_VALUE_VAL' => ""
-          ));
-          $this->templ->parse("options", "each_option", true);
-       }

        /* display a blank form  */
        $this->templ->set_var(array(
           'ACTION_URL'    => $this->psl['phpself'],
           'BLOCK_TITLE'   => "",
--- 93,100 ----
           $this->templ->parse("section_rows","section_row",true);
        }

        /* display a blank form  */
        $this->templ->set_var(array(
+          'TITLEBAR'      => getTitlebar("100%", "Create a New Block"),
           'ACTION_URL'    => $this->psl['phpself'],
           'BLOCK_TITLE'   => "",
***************
*** 119,124 ****
        ));

!       $this->templ->parse('OUT',array("newblock"));
!       $this->templ->p('OUT');  
     }

--- 107,114 ----
        ));

!       $this->templ = displayoptions('block', $this->templ, "newblock", ''); 
! 
!       return $this->templ->parse('OUT',array("newblock"));
!       // $this->templ->p('OUT');  
     }

***************
*** 133,140 ****
     function editBlock($id) {

-       titlebar("100%", "Update a Block");
        $this->getBlock($id);

- 
        /*
        * Get the section_id's for this story into an array
--- 123,128 ----
***************
*** 154,158 ****
        $this->templ->set_block("editblock","block_type_row","block_type_rows");
        $this->templ->set_block("editblock","section_row","section_rows");
!       $this->templ->set_block("editblock","each_option", "options");

        $ary = $this->getTypes();
--- 142,146 ----
        $this->templ->set_block("editblock","block_type_row","block_type_rows");
        $this->templ->set_block("editblock","section_row","section_rows");
!       // $this->templ->set_block("editblock","each_option", "options");

        $ary = $this->getTypes();
***************
*** 194,230 ****
           reset($temparray);
        }
-       $blockcnt = $this->psl['block_optioncount'];
-       $i = 1;
- 
-       if (is_array($temparray)) {
-          for ($i =1; $i <= count($temparray); $i++) {
-             $current=each($temparray);
- 	    if ($current) {
-                $this->templ->set_var(array(
-                   'OPTION_NAME'     => "optionname[$i]",
-                   'OPTION_NAME_VAL' => $current[0],
-                   'OPTION_VALUE'    => "optionval[$i]",
-                   'OPTION_VALUE_VAL' => $current[1]
-                ));
-             }
- 	    $this->templ->parse("options", "each_option", true);
-          }
- 	 if( (count($temparray) - $blockcnt) >= 0) {
-             $blockcnt = $i;  // spit out one more;
- 	 }
-       } 
-       
-       while ($i <= $blockcnt) {
-          $this->templ->set_var(array(
-             'OPTION_NAME'     => "optionname[$i]",
-             'OPTION_NAME_VAL' => "",
-             'OPTION_VALUE'    => "optionval[$i]",
-             'OPTION_VALUE_VAL' => ""
-          ));
- 	 $this->templ->parse("options", "each_option", true);
- 	 $i++;
-       }

        $this->templ->set_var(array(
           'ACTION_URL'    => $this->psl['phpself'],
           'BLOCK_TITLE'   => $this->block_info["title"],
--- 182,188 ----
           reset($temparray);
        }

        $this->templ->set_var(array(
+          'TITLEBAR'      => getTitlebar("100%", "Update a Block"),
           'ACTION_URL'    => $this->psl['phpself'],
           'BLOCK_TITLE'   => $this->block_info["title"],
***************
*** 237,243 ****
        ));

!       $this->templ->parse('OUT',array("editblock"));
!       $this->templ->p('OUT');
        $this->templ->set_var('OUT',"");

     }
--- 195,204 ----
        ));

!       $this->templ = displayoptions('block', $this->templ, "editblock", $temparray);
! 
!       $output = $this->templ->parse('OUT',array("editblock"));
!       // $this->templ->p('OUT');
        $this->templ->set_var('OUT',"");
+       return $output;

     }
***************
*** 274,277 ****
--- 235,239 ----

           $this->templ->set_var(array(
+ 	    'TITLEBAR'   => getTitlebar("100%", "Update the Current Blocks"),
              'MODIFYURL'  => $modifyurl,
              'DELURL'     => $delurl,
***************
*** 290,297 ****
        }

!       titlebar("100%", "Update the Current Blocks");
! 
!       $this->templ->parse('OUT', array("listblock"));
!       $this->templ->p('OUT');
     }

--- 252,257 ----
        }

!       return $this->templ->parse('OUT', array("listblock"));
!       // $this->templ->p('OUT');
     }

***************
*** 313,317 ****
        ));

!       titlebar("100%","Manage Block Types");

        if( $option == "all") {
--- 273,277 ----
        ));

!       $output = getTitlebar("100%","Manage Block Types");

        if( $option == "all") {
***************
*** 347,351 ****

  	    }
-             
  	 }
           $this->templ->set_block("listblocktypes","addrow","rows");
--- 307,310 ----
***************
*** 360,365 ****
           }

!          $this->templ->parse('OUT',array("listblocktypes"));
!          $this->templ->p('OUT');
        } elseif ($option == "add") {
           $this->putType($name);
--- 319,324 ----
           }

!          $output .= $this->templ->parse('OUT',array("listblocktypes"));
!          // $this->templ->p('OUT');
        } elseif ($option == "add") {
           $this->putType($name);
***************
*** 369,374 ****
  	 $this->listBlockTypes("all");
        } else {
!          echo "<A HREF=" . $this->psl['phpself'] . "?submit=display" . $this->psl['amp'] . "option=all>[Add or Remove Block Types]</A>"; 
        }
     }

--- 328,334 ----
  	 $this->listBlockTypes("all");
        } else {
!          $output .= "<A HREF=" . $this->psl['phpself'] . "?submit=display" . $this->psl['amp'] . "option=all>[Add or Remove Block Types]</A>"; 
        }
+       return $output;
     }

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

phpslash-commit Mailing List for phpSlash (Page 86)

phpslash-commit — A list for automatically mailed SCM Commits