Merge branch 'develop'

willmav5000 · Jun 3, 2011 · 80b8332 · 80b8332
2 parents 51fa484 + 1d866e9
commit 80b8332
Show file tree

Hide file tree

Showing 65 changed files with 6,887 additions and 2,031 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -0,0 +1,4 @@
+Sitemap Generator 1.0.3 2011-05-06
+----------------------------------
+
+- Updated .po file
diff --git a/README b/README
diff --git a/ads4osc/Ads.php b/ads4osc/Ads.php
diff --git a/ads4osc/create.php b/ads4osc/create.php
diff --git a/ads4osc/edit.php b/ads4osc/edit.php
diff --git a/ads4osc/index.php b/ads4osc/index.php
@@ -97,9 +97,9 @@ function show_ads($name = '') {
 }
 
 // This is needed in order to be able to activate the plugin
-osc_register_plugin(__FILE__, 'ads_call_after_install');
+osc_register_plugin(osc_plugin_path(__FILE__), 'ads_call_after_install');
 // This is a hack to show a Uninstall link at plugins table (you could also use some other hook to show a custom option panel)
-osc_add_hook(__FILE__."_uninstall", 'ads_call_after_uninstall');
+osc_add_hook(osc_plugin_path(__FILE__)."_uninstall", 'ads_call_after_uninstall');
 
 osc_add_hook('admin_menu', 'ads_admin_menu');
 

diff --git a/ads4osc/launcher.php b/ads4osc/launcher.php
@@ -58,8 +58,8 @@
             if($ad['s_network']=='adsense') {
                 $ad['s_code'] = preg_replace('|google_ad_client = "([^"]+)|', 'google_ad_client = "'.$ad['s_account_id'], $ad['s_code']);
                 $ad['s_code'] = preg_replace('|google_ad_slot = "([^"]+)|', 'google_ad_slot = "'.$ad['s_slot_id'], $ad['s_code']);
-                $ad['s_code'] = preg_replace('|google_ad_width = ([0-9]+)|', 'google_ad_width = "'.$ad['i_ad_width'], $ad['s_code']);
-                $ad['s_code'] = preg_replace('|google_ad_height = ([0-9]+)|', 'google_ad_height = "'.$ad['i_ad_height'], $ad['s_code']);
+                $ad['s_code'] = preg_replace('|google_ad_width = ([0-9]+)|', 'google_ad_width = '.$ad['i_ad_width'], $ad['s_code']);
+                $ad['s_code'] = preg_replace('|google_ad_height = ([0-9]+)|', 'google_ad_height = '.$ad['i_ad_height'], $ad['s_code']);
             }
 
             $ads->update_ad($ad);

diff --git a/ads4osc/list.php b/ads4osc/list.php
diff --git a/breadcrumbs/index.php b/breadcrumbs/index.php
@@ -3,7 +3,7 @@
 Plugin Name: Bread crumbs
 Plugin URI: http://www.osclass.org/
 Description: Breadcrumbs navigation system.
-Version: 1.5
+Version: 1.5.1
 Author: OSClass
 Author URI: http://www.osclass.org/
 Short Name: breadcrumbs
@@ -68,7 +68,7 @@ function breadcrumbs_category_url($category_id) {
             $path = osc_base_url() . $sanitized_category ;
         }
     } else {
-        $path = sprintf( osc_base_url(true) . '?page=search&sCategory=%d', $category['pk_i_id'] ) ;
+        $path = sprintf( osc_base_url(true) . '?page=search&sCategory=%d', $category_id ) ;
     }
     return $path ;
 }
@@ -77,23 +77,23 @@ function breadcrumbs_category_url($category_id) {
 function breadcrumbs_admin_menu() {
     echo '<h3><a href="#">Breadcrumbs</a></h3>
     <ul> 
-        <li><a href="'.osc_admin_render_plugin_url(dirname(__FILE__) . '/help.php').'">&raquo; '.__('F.A.Q. / Help', 'breadcrumbs').'</a></li>
+        <li><a href="'.osc_admin_render_plugin_url(osc_plugin_path(dirname(__FILE__)) . '/help.php').'">&raquo; '.__('F.A.Q. / Help', 'breadcrumbs').'</a></li>
     </ul>';
 }
 
 function breadcrumbs_help() {
-    osc_admin_render_plugin(dirname(__FILE__) . '/help.php') ;
+    osc_admin_render_plugin(osc_plugin_path(dirname(__FILE__)) . '/help.php') ;
 }
 
 
 
 
 // This is needed in order to be able to activate the plugin
-osc_register_plugin(__FILE__, '');
+osc_register_plugin(osc_plugin_path(__FILE__), '');
 // This is a hack to show a Configure link at plugins table (you could also use some other hook to show a custom option panel)
-osc_add_hook(__FILE__."_configure", 'breadcrumbs_help');
+osc_add_hook(osc_plugin_path(__FILE__)."_configure", 'breadcrumbs_help');
 // This is a hack to show a Uninstall link at plugins table (you could also use some other hook to show a custom option panel)
-osc_add_hook(__FILE__."_uninstall", '');
+osc_add_hook(osc_plugin_path(__FILE__)."_uninstall", '');
 // Add the help to the menu
 osc_add_hook('admin_menu', 'breadcrumbs_admin_menu');
 

diff --git a/cars_attributes/conf.php b/cars_attributes/conf.php
@@ -28,6 +28,7 @@
         switch(Params::getParam("plugin_action")) 
         {
             case("make_delete"):    if(Params::getParam("id")!="") {
+                                        $conn->osc_dbExec('DELETE FROM %st_item_car_model_attr WHERE fk_i_make_id = %d', DB_TABLE_PREFIX, Params::getParam("id"));
                                         $conn->osc_dbExec('DELETE FROM %st_item_car_make_attr WHERE pk_i_id = %d', DB_TABLE_PREFIX, Params::getParam("id"));
                                     }
             break;
@@ -204,7 +205,7 @@
                                         <fieldset>
                                         <legend><?php echo __('Vehicle types'); ?></legend>
                                         <div class="tabber">
-                                        <?php $locales = Locale::newInstance()->listAllEnabled();
+                                        <?php $locales = osc_get_locales();
                                             $car_type = $conn->osc_dbFetchResults('SELECT * FROM %st_item_car_vehicle_type_attr', DB_TABLE_PREFIX);
                                             $data = array();
                                             foreach ($car_type as $c) {
@@ -246,7 +247,7 @@
                                         <input type="hidden" name="plugin_action" value="type_add" />
 
                                         <div class="tabber">
-                                        <?php $locales = Locale::newInstance()->listAllEnabled();
+                                        <?php $locales = osc_get_locales();
                                             $car_type = $conn->osc_dbFetchResults('SELECT * FROM %st_item_car_vehicle_type_attr', DB_TABLE_PREFIX);
                                             $data = array();
                                             foreach ($car_type as $c) {

diff --git a/cars_attributes/form.php b/cars_attributes/form.php
diff --git a/cars_attributes/img/cross.png b/cars_attributes/img/cross.png
diff --git a/cars_attributes/img/tick.png b/cars_attributes/img/tick.png