Changeset 2338 for plugins/pollsFactory/inc

Timestamp:

06/09/10 03:12:52 (13 years ago)

Author:

JcDenis

Message:

pollsFactory 1.3

• Switched to DC 2.2
• Fixed minor bugs

Location:

plugins/pollsFactory/inc

Files:

• class.pollsfactory.chart.php (modified) (2 diffs)
• class.pollsfactory.php (modified) (3 diffs)
• index.polls.php (modified) (1 diff)
• index.setting.php (modified) (2 diffs)

plugins/pollsFactory/inc/class.pollsfactory.chart.php

@@ -30 +30 @@
           # Cache directory
           $this->cache_dir = path::real(DC_TPL_CACHE);
-          $use_cache = (boolean) $core->blog->settings->pollsFactory_graph_cache;
+          $use_cache = (boolean) $core->blog->settings->pollsFactory->pollsFactory_graph_cache;
           if (!$use_cache || !is_dir($this->cache_dir) || !is_writable($this->cache_dir)) {
                $this->cache_dir = null;
           }
           # Image properties
-          $this->prop = @unserialize($core->blog->settings->pollsFactory_graph_options);
+          $this->prop = @unserialize($core->blog->settings->pollsFactory->pollsFactory_graph_options);
           if (!is_array($this->prop) || empty($this->prop)){
                $this->prop = self::defaultOptions();
@@ -42 +42 @@
           }
           # Last update
-          $this->trigger = (integer) $core->blog->settings->pollsFactory_graph_trigger;
+          $this->trigger = (integer) $core->blog->settings->pollsFactory->pollsFactory_graph_trigger;
      }
 

plugins/pollsFactory/inc/class.pollsfactory.php

@@ -34 +34 @@
           $chk = false;
           $poll_id = (integer) $poll_id;
-          $ident = (integer) $this->core->blog->settings->pollsFactory_people_ident;
+          $ident = (integer) $this->core->blog->settings->pollsFactory->pollsFactory_people_ident;
 
           # Cookie
@@ -104 +104 @@
 
           # Cookie
-          if($this->core->blog->settings->pollsFactory_people_ident < 2)
+          if($this->core->blog->settings->pollsFactory->pollsFactory_people_ident < 2)
           {
                $list = isset($_COOKIE['pollsFactoryVotes']) ?
@@ -113 +113 @@
           }
           # Ident
-          $ip = $this->core->blog->settings->pollsFactory_people_ident > 0 ?
+          $ip = $this->core->blog->settings->pollsFactory->pollsFactory_people_ident > 0 ?
                $this->con->escape(http::realIP()) :
                substr(http::browserUID(DC_MASTER_KEY),0,24);

plugins/pollsFactory/inc/index.polls.php

@@ -288 +288 @@
 if ($core->auth->check('publish,contentadmin',$core->blog->id))
 {
-     $combo_action[__('publish')] = 'publish';
-     $combo_action[__('unpublish')] = 'unpublish';
-     $combo_action[__('schedule')] = 'schedule';
-     $combo_action[__('mark as pending')] = 'pending';
-     $combo_action[__('open voting')] = 'open';
-     $combo_action[__('close voting')] = 'close';
-}
-$combo_action[__('mark as selected')] = 'selected';
-$combo_action[__('mark as unselected')] = 'unselected';
+     $combo_action[__('Status')][__('Publish')] = 'publish';
+     $combo_action[__('Status')][__('Unpublish')] = 'unpublish';
+     $combo_action[__('Status')][__('Schedule')] = 'schedule';
+     $combo_action[__('Status')][__('Mark as pending')] = 'pending';
+     $combo_action[__('Votes')][__('Open voting')] = 'open';
+     $combo_action[__('Votes')][__('Close voting')] = 'close';
+}
+$combo_action[__('Mark')][__('Mark as selected')] = 'selected';
+$combo_action[__('Mark')][__('Mark as unselected')] = 'unselected';
 if ($core->auth->check('delete,contentadmin',$core->blog->id))
 {
-     $combo_action[__('delete')] = 'delete';
+     $combo_action[__('Delete')][__('Delete')] = 'delete';
 }
 

plugins/pollsFactory/inc/index.setting.php

@@ -32 +32 @@
 if ($default_tab == 'setting' && $action == 'savesetting')
 {
-     try {
-          $s->setNameSpace('pollsFactory');
+     try
+     {
           $s->put('pollsFactory_active',!empty($_POST['active']));
           $s->put('pollsFactory_people_ident', (integer) $_POST['people_ident']);
@@ -53 +53 @@
           }
 
-          $s->setNameSpace('system');
           $core->blog->triggerBlog();
 
           http::redirect($p_url.'&tab=setting&msg='.$action.'&section='.$section);
      }
-     catch (Exception $e) {
+     catch (Exception $e)
+     {
           $core->error->add($e->getMessage());
      }