[Phpslash-commit] CVS: phpslash-dev/include/modules/story Story_base.class,1.9,1.10
Brought to you by:
joestewart,
nhruby
Menu
▾
▴
[Phpslash-commit] CVS: phpslash-dev/include/modules/story Story_base.class,1.9,1.10
|
From: Peter C. <kr...@us...> - 2004-07-07 18:24:44
|
Update of /cvsroot/phpslash/phpslash-dev/include/modules/story In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27236 Modified Files: Story_base.class Log Message: Improvements to logic + presentation of validation process Index: Story_base.class =================================================================== RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/story/Story_base.class,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Story_base.class 26 Nov 2003 19:33:21 -0000 1.9 --- Story_base.class 7 Jul 2004 18:24:36 -0000 1.10 *************** *** 464,475 **** if((!$this->perm->have_perm('storyeditothers')) AND ( $ary['author_id'] != $this->auth->auth['uid'])) { ! $this->message = pslgetText("Sorry. You do not have the necessary privilege to view this page."); return false; } $topic_id_ary = $ary['topic_id_ary']; // move the section id's from the array value to the array key ! if(is_array($ary['section_id_ary'])) { foreach($ary['section_id_ary'] as $value) { $section_id_ary[$value] = true; --- 464,477 ---- if((!$this->perm->have_perm('storyeditothers')) AND ( $ary['author_id'] != $this->auth->auth['uid'])) { ! $this->message .= pslgetText("Sorry. You do not have the necessary privilege to view this page."); return false; } + $isOK = true; + $topic_id_ary = $ary['topic_id_ary']; // move the section id's from the array value to the array key ! if (is_array(@$ary['section_id_ary'])) { foreach($ary['section_id_ary'] as $value) { $section_id_ary[$value] = true; *************** *** 486,515 **** */ if ($topic_id_ary[0] == "") { ! $this->message = "You need to select at least one topic in Story.class::saveStory"; ! return false; } if (count($section_id_ary) < 1) { ! $this->message = "You need to select at least one section in Story.class::saveStory"; ! return false; } if ($ary['title'] == "") { ! $this->message = "There is no title in Story.class::saveStory"; ! return false; } if ($ary['intro_text'] == "") { ! $this->message = "There is no intro_text in Story.class::saveStory"; ! return false; } if ($ary['author_id'] == "") { ! $this->message = "There is no author_id in Story.class::saveStory"; return false; } ! if ($ary['datetime'] == "") { if( $ary['story_date'] ) { $ary['datetime'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']); ! } else { $ary['datetime'] = date("Y-m-d H:i:s"); ! } } $ary['timestamp'] = strtotime($ary['datetime']); --- 488,521 ---- */ if ($topic_id_ary[0] == "") { ! $this->message .= getError("You need to select at least one topic in Story.class::saveStory"); ! $isOK = false; } if (count($section_id_ary) < 1) { ! $this->message .= getError("You need to select at least one section in Story.class::saveStory"); ! $isOK = false; } if ($ary['title'] == "") { ! $this->message .= getError("There is no title in Story.class::saveStory"); ! $isOK = false; } if ($ary['intro_text'] == "") { ! $this->message .= getError("There is no intro_text in Story.class::saveStory"); ! $isOK = false; } if ($ary['author_id'] == "") { ! $this->message .= getError("There is no author_id in Story.class::saveStory"); ! $isOK = false; ! } ! ! if (!$isOK) { return false; } ! if (empty($ary['datetime'])) { if( $ary['story_date'] ) { $ary['datetime'] = implode( '-', $ary['story_date']) ." ". implode( ':',$ary['story_time']); ! } else { $ary['datetime'] = date("Y-m-d H:i:s"); ! } } $ary['timestamp'] = strtotime($ary['datetime']); *************** *** 518,523 **** $ary['dept'] = eregi_replace(' ','-',addslashes($ary['dept'])); $ary['order_no'] = eregi_replace(' ','-',addslashes($ary['order_no'])); ! $ary['intro_text'] = addslashes($ary['intro_text']); ! $ary['body_text'] = addslashes($ary['body_text']); // body_text_file comes from a file uploaded to us. --- 524,529 ---- $ary['dept'] = eregi_replace(' ','-',addslashes($ary['dept'])); $ary['order_no'] = eregi_replace(' ','-',addslashes($ary['order_no'])); ! $ary['intro_text'] = addslashes(trim($ary['intro_text'])); ! $ary['body_text'] = addslashes(trim($ary['body_text'])); // body_text_file comes from a file uploaded to us. *************** *** 526,530 **** // ; File Uploads ; // ;;;;;;;;;;;;;;;; ! // file_uploads = On ; Whether to allow HTTP file uploads // upload_tmp_dir = /tmp ; temporary directory for HTTP uploaded files (will use system default if not specified) // upload_max_filesize = 2M ; Maximum allowed size for uploaded files --- 532,536 ---- // ; File Uploads ; // ;;;;;;;;;;;;;;;; ! // file_uploads = On ; Whether to allow HTTP file uploads // upload_tmp_dir = /tmp ; temporary directory for HTTP uploaded files (will use system default if not specified) // upload_max_filesize = 2M ; Maximum allowed size for uploaded files *************** *** 535,542 **** // since php 4.1.x // if we were sent a file, then use this to create preview ! // let's allow users to type text in the body_text field // (text area) and also submit a file... in other words // append file to text typed. ! if ( is_uploaded_file($_FILES['body_text_file']['tmp_name']) --- 541,548 ---- // since php 4.1.x // if we were sent a file, then use this to create preview ! // let's allow users to type text in the body_text field // (text area) and also submit a file... in other words // append file to text typed. ! if ( is_uploaded_file($_FILES['body_text_file']['tmp_name']) *************** *** 545,549 **** $binary_junk = parse_upload($_FILES['body_text_file']['tmp_name']); // append this file to the text typed in TEXT box: ! $ary['body_text'] .= addslashes($binary_junk); } // end if isset ary[body_text_file] --- 551,555 ---- $binary_junk = parse_upload($_FILES['body_text_file']['tmp_name']); // append this file to the text typed in TEXT box: ! $ary['body_text'] .= addslashes(trim($binary_junk)); } // end if isset ary[body_text_file] *************** *** 555,559 **** // $ary['body_text'] = put_latin($ary['body_text']); // $ary['intro_text'] = put_latin($ary['intro_text']); ! // $ary['title'] = put_latin($ary['title']); // echo "<BR><BR>STORYID: $ary['story_id']<BR><BR>SID: $story_id<BR><BR>\n"; --- 561,565 ---- // $ary['body_text'] = put_latin($ary['body_text']); // $ary['intro_text'] = put_latin($ary['intro_text']); ! // $ary['title'] = put_latin($ary['title']); // echo "<BR><BR>STORYID: $ary['story_id']<BR><BR>SID: $story_id<BR><BR>\n"; *************** *** 809,814 **** */ ! if ( ($ary[$field_name]['expire'] > 0) AND ! ($now - $ary[$field]['update']) > $ary[$field]['expire'] ) { $expired = true; } --- 815,820 ---- */ ! if ( (@$ary[$field_name]['expire'] > 0) && ! ($now - $ary[$field]['update']) > @$ary[$field]['expire'] ) { $expired = true; } |