Changeset 1013 in ExiteCMS

Timestamp:

10/24/07 21:08:44 (4 years ago)

Author:

hverton

Message:

Merged trunk revision 1006:1012 into the PLi-Fusion branch

Location:

branches/PLi-Fusion

Files:

• forum/index.php (modified) (1 diff)
• forum/viewforum.php (modified) (1 diff)
• locale/English/admin/adverts.php (deleted)
• locale/English/admin/photoalbums.php (deleted)
• locale/English/admin/photos.php (deleted)
• locale/English/admin/polls.php (deleted)
• locale/English/admin/shoutbox.php (deleted)
• locale/English/admin/weblinks.php (deleted)
• setup.php (modified) (3 diffs)

branches/PLi-Fusion/forum/index.php

@@ -25 +25 @@
 include PATH_LOCALE.LOCALESET."forum/main.php";
 
-// load the advertisement include module
-require_once PATH_INCLUDES."advertisement.php";
-$variables['advert'] = get_advert(array(1,2));
+// load the advertisement include module and get an ad for this forum page
+if (file_exists(PATH_MODULES."advertising/get_ad.php")) {
+    // load the ad include module
+    require_once PATH_MODULES."advertising/get_ad.php";
+    $variables['advert'] = get_ad(array(1,2));
+} else {
+    $variables['advert'] = "";
+}
 
 // when is a folder hot?

branches/PLi-Fusion/forum/viewforum.php

@@ -35 +35 @@
 require_once PATH_INCLUDES."forum_functions_include.php";
 
-// load the advertisement include module
-require_once PATH_INCLUDES."advertisement.php";
-$variables['advert'] = get_advert(array(1,2));
+// load the advertisement include module and get an ad for this forum page
+if (file_exists(PATH_MODULES."advertising/get_ad.php")) {
+    require_once PATH_MODULES."advertising/get_ad.php";
+    $variables['advert'] = get_ad(array(1,2));
+} else {
+    $variables['advert'] = "";
+}
 
 // define how many threads per page we want

branches/PLi-Fusion/setup.php

@@ -302 +302 @@
             $result = dbquery("INSERT INTO ".$db_prefix."locale (locale_code, locale_name, locale_active) VALUES ('en', 'English', 1)");
 
-            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('A', 'articles.gif', '".$locale['462']."', 'articles.php', 1)");
+            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('A',  'articles.gif', '".$locale['462']."', 'articles.php', 1)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('AC', 'article_cats.gif', '".$locale['461']."', 'article_cats.php', 1)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('AD', 'admins.gif', '".$locale['460']."', 'administrators.php', 2)");
-            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('B', 'blacklist.gif', '".$locale['463']."', 'blacklist.php', 2)");
-            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('C', '', '".$locale['464']."', 'reserved', 2)");
+            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('B',  'blacklist.gif', '".$locale['463']."', 'blacklist.php', 2)");
+            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('C',  '', '".$locale['464']."', 'reserved', 2)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('CP', 'c-pages.gif', '".$locale['465']."', 'custom_pages.php', 1)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('D',  'dl.gif', '".$locale['468']."', 'downloads.php', 1)");
@@ -313 +313 @@
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('F',  'forums.gif', '".$locale['470']."', 'forums.php', 1)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('FQ', 'faq.gif', '".$locale['469']."', 'faq.php', 1)");
-            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('I', 'modules.gif', '".$locale['472']."', 'modules.php', 3)");
+            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('I',  'modules.gif', '".$locale['472']."', 'modules.php', 3)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('IM', 'images.gif', '".$locale['471']."', 'images.php', 1)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('IP', '', '".$locale['473']."', 'reserved', 3)");
@@ -333 +333 @@
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('UG', 'user_groups.gif', '".$locale['484']."', 'user_groups.php', 2)");
             $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('UR', 'submissions.gif', '".$locale['496']."', 'redirects.php', 1)");
-            $result = dbquery("INSERT INTO ".$db_prefix."admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('wE', 'adverts.gif', '".$locale['498']."', 'adverts.php', 1)");
-
+    
             $result = dbquery("INSERT INTO ".$db_prefix."custom_pages (page_id, page_title, page_access, page_content, page_allow_comments, page_allow_ratings) VALUES (0, '404 Error Page', 0, '".mysql_escape_string("<table border=\"0\" cellspacing=\"0\" cellpadding=\"5\" width=\"100%\" align=\"center\"> <tbody><tr><td width=\"10\"> </td><td><div align=\"center\"><font size=\"6\"><span class=\"shoutboxname\"><br />404 - Page Not Found</span><br /></font></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">".$locale['560']."<br /></div><br /><div align=\"center\">".$locale['561']."<br /></div><br /><div align=\"center\">".$locale['562']."<br /></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">".$locale['563']."<br /></div><br /><div align=\"center\">".$locale['564']."</div></td><td width=\"10\"> </td></tr></tbody></table><br />")."', 0, 0)");