[ros-diffs] [frik85] 24749: RosCMS update: * dynamic content section update

Author: frik85
Date: Tue Nov 14 00:01:07 2006
New Revision: 24749

URL: http://svn.reactos.org/svn/reactos?rev=24749&view=rev
Log:
RosCMS update:

* dynamic content section update

Modified:
    trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php
    trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/…
==============================================================================
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent.php Tue Nov 14 00:01:07 2006
@@ -41,14 +41,14 @@
   </ul>
   <p>Action: <a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;sec3=news_page&amp;opt=insert&amp;<?php
echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">
     <?php if ($roscms_intern_usrgrp_admin == true && $rpm_page ==
"admin") { ?>
-    New 
-    News</a> | <a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;sec3=newsletter&amp;opt=insert&amp;<?php
echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">New 
-    Newsletter</a> | <a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;sec3=blog&amp;opt=insert&amp;<?php
echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">New 
-    Blog</a> | <a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;opt=insert&amp;<?php echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new"></a><a href="?page=<?php echo
$rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;opt=insert&amp;<?php echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">New 
-    Dynamic Content (plain)</a> | <a href="?page=<?php echo $rpm_page;
?>&sec=dyncontent&sec2=view">
+    New News</a> |
+	<a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;sec3=newsletter&amp;opt=insert&amp;<?php
echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">New Newsletter</a> | 
+	<a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;sec3=interview&amp;opt=insert&amp;<?php
echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">New Interview</a> | 
+	<?php /* <a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;sec3=blog&amp;opt=insert&amp;<?php
echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">New Blog</a> |  */ ?>
+	<a href="?page=<?php echo $rpm_page;
?>&amp;sec=dyncontent&amp;sec2=edit&amp;opt=insert&amp;<?php echo
'sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2='.$rpm_filt2.'&amp;langid='.$rpm_lang_id
; ?>&amp;db_id=new">New Dynamic Content (plain)</a> | 
+	<a href="?page=<?php echo $rpm_page;
?>&sec=dyncontent&sec2=view">
     <?php } ?>
-    reset 
-    filters & sort</a></p>
+    reset filters & sort</a></p>
     
   <?php
 	if($roscms_intern_account_level>50) {
@@ -166,13 +166,21 @@
 		echo '<a
href="?page='.$rpm_page.'&amp;sec=dyncontent&amp;sec2=view&amp;sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2=newsletter&amp;langid='.$rpm_lang_id.'">newsletter</a>';
 	}
 	echo ' | ';
+	if ($rpm_filt2 == "interview") {	
+		echo '<b>interview</b>';
+		$ros_cms_intern_content_filt2 = " AND `dyn_content_name` =
'interview'";
+	}
+	else {
+		echo '<a
href="?page='.$rpm_page.'&amp;sec=dyncontent&amp;sec2=view&amp;sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2=interview&amp;langid='.$rpm_lang_id.'">interview</a>';
+	}
+/*	echo ' | ';
 	if ($rpm_filt2 == "blog") {	
 		echo '<b>blog</b>';
 		$ros_cms_intern_content_filt2 = " AND `dyn_content_name` = 'blog'";
 	}
 	else {
 		echo '<a
href="?page='.$rpm_page.'&amp;sec=dyncontent&amp;sec2=view&amp;sort='.$rpm_sort.'&amp;filt='.$rpm_filt.'&amp;filt2=blog&amp;langid='.$rpm_lang_id.'">blog</a>';
-	}
+	}*/
 	/*echo ' | ';
 	if ($rpm_filt2 == "dev_page") {	
 		echo '<b>dev page</b>';

Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php
URL:
http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/…
==============================================================================
--- trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/admin_dyncontent_edit.php Tue Nov 14 00:01:07
2006
@@ -49,6 +49,9 @@
 	elseif ($rpm_sec3 == "newsletter") {
 		echo "<b>Newsletter Interface</b>";
 	}
+	elseif ($rpm_sec3 == "interview") {
+		echo "<b>Interview Interface</b>";
+	}
 	elseif ($rpm_sec3 == "blog") {
 		echo "<b>Blog Interface</b>";
 	}
@@ -67,13 +70,30 @@
       <tr bgcolor="#5984C3"> 
         <td bgcolor="#5984C3"><div
align="center"><font color="#FFFFFF" face="Arial,
Helvetica, sans-serif"><strong>Content 
             ID</strong></font></div></td>
-        <td bgcolor="#EEEEEE"> <input name="txt_contentid"
type="text" id="txt_contentid" value="<?php echo
$result_content['dyn_content_id']; ?>" size="20"
maxlength="20">        </td>
+        <td bgcolor="#EEEEEE"> <input name="txt_contentid"
type="text" id="txt_contentid" value="<?php 
+		
+		if ($rpm_db_id == "new") {
+			$query_content_count = mysql_query("SELECT COUNT( * ) 
+												FROM `dyn_content` 
+												WHERE 1 
+												AND `dyn_content_name` =
'".mysql_real_escape_string($rpm_sec3)."'
+												AND `dyn_content_nr` = '1'
+												ORDER BY dyn_content_id ASC ;");
+			$result_content_count = mysql_fetch_row($query_content_count);
+			
+			echo ($result_content_count[0]+1);
+		}
+		else {		
+			echo $result_content['dyn_content_id'];
+		}
+		
+		 ?>" size="20" maxlength="20">        </td>
       </tr>
       <tr> 
         <td valign="top" bgcolor="#5984C3"> <div
align="center"><font color="#FFFFFF" face="Arial,
Helvetica,
sans-serif"><strong>Language</strong></font></div></td>
         <td valign="top" bgcolor="#E2E2E2"><div
align="left"> 
 		<?php
-			if ($rpm_sec3 == "news_page" || $rpm_sec3 == "newsletter") {
+			if ($rpm_sec3 == "news_page" || $rpm_sec3 == "newsletter" ||
$rpm_sec3 == "interview") {
 		?>
 			<input name="txt_contentnr" type="hidden" value="1"
/>
 		<?php
@@ -113,7 +133,7 @@
           </div></td>
       </tr>	  
 <?php
-	if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter")
{
+	if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter" 
&& $rpm_sec3 != "interview") {
 ?>
       <tr bgcolor="#5984C3"> 
         <td width="15%" bgcolor="#5984C3"> <div
align="center"><font color="#FFFFFF" face="Arial,
Helvetica, sans-serif"><strong>Content 
@@ -141,6 +161,9 @@
 		elseif ($rpm_sec3 == "newsletter") {
 			echo "Title";
 		}
+		elseif ($rpm_sec3 == "interview") {
+			echo "Title";
+		}
 		elseif ($rpm_sec3 == "blog") {
 			echo "Title";
 		}
@@ -152,7 +175,7 @@
         <td valign="top" bgcolor="#EEEEEE"><input
name="txt_content_text1" type="text" id="txt_content_text1"
value="<?php echo $result_content['dyn_content_text1']; ?>"
size="50" maxlength="100"></td>
       </tr>
 <?php
-	if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter")
{
+	if ($rpm_sec3 != "news_page" && $rpm_sec3 != "newsletter"
&& $rpm_sec3 != "interview") {
 ?>
       <tr> 
         <td valign="top" bgcolor="#5984C3"><div
align="center"><font color="#FFFFFF" face="Arial,
Helvetica, sans-serif"><strong><?php 
@@ -162,6 +185,9 @@
 		elseif ($rpm_sec3 == "newsletter") {
 			echo "-";
 		}
+		elseif ($rpm_sec3 == "interview") {
+			echo "-";
+		}
 		elseif ($rpm_sec3 == "blog") {
 			echo "Category";
 		}
@@ -183,6 +209,9 @@
 		elseif ($rpm_sec3 == "newsletter") {
 			echo "Description";
 		}
+		elseif ($rpm_sec3 == "interview") {
+			echo "Description";
+		}
 		elseif ($rpm_sec3 == "blog") {
 			echo "Description";
 		}
@@ -202,6 +231,9 @@
 			echo "Content";
 		}
 		elseif ($rpm_sec3 == "newsletter") {
+			echo "Content";
+		}
+		elseif ($rpm_sec3 == "interview") {
 			echo "Content";
 		}
 		elseif ($rpm_sec3 == "blog") {