Changeset 1012 in ExiteCMS

Timestamp:

10/24/07 21:03:42 (4 years ago)

Author:

root

Message:

Moved the get_ad() module out of the trunk and into the advertising module

Files:

• modules/common/ad_side_panel/php-files/modules/ad_side_panel/ad_side_panel.php (modified) (1 diff)
• modules/common/advertising/php-files/modules/advertising/get_ad.php (added)
• trunk/forum/index.php (modified) (1 diff)
• trunk/forum/viewforum.php (modified) (1 diff)

modules/common/ad_side_panel/php-files/modules/ad_side_panel/ad_side_panel.php

@@ -17 +17 @@
 } else {
 
-    // load the locale for this module
-    require_once PATH_LOCALE.LOCALESET."admin/adverts.php";
+    // check if the advertising module is installed
+    if (file_exists(PATH_MODULES."advertising/get_ad.php")) {
 
-    // check if the advertising module is installed
-    if (file_exists(PATH_INCLUDES."advertisement.php")) {
-        
-        // load the advertisement include module
-        require_once PATH_INCLUDES."advertisement.php";
+        // load the locale for this panel
+        if (file_exists(PATH_MODULES."advertising/locale/".$settings['locale'].".php")) {
+                $locale_file = PATH_MODULES."advertising/locale/".$settings['locale'].".php";
+        } else {
+                $locale_file = PATH_MODULES."advertising/locale/English.php";
+        }
+        include $locale_file;
+
+        // load the ad include module
+        require_once PATH_MODULES."advertising/get_ad.php";
     
         // array's to store the variables for this panel
-        $ad = get_advert(0,0,0);
+        $ad = get_ad(0,0,0);
 
     } else {

trunk/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?

trunk/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