Changeset 3:cf375f1e7b0f for inc/core

Timestamp:

04/27/11 09:06:30 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

userprefs

Message:

Ported Franck & Kozlika updates for user prefs, dedicated branch

Location:

inc/core

Files:

• class.dc.auth.php (modified) (2 diffs)
• class.dc.media.php (modified) (2 diffs)
• class.dc.prefs.php (added)
• class.dc.workspace.php (added)

inc/core/class.dc.auth.php

@@ -40 +40 @@
      protected $perm_types;   ///< <b>array</b> Permission types
      
+     public $user_prefs; ///< <b>dcPrefs</b> dcPrefs object
+     
      /**
      Class constructor. Takes dcCore object as single argument.
@@ -136 +138 @@
           $this->user_options = array_merge($this->core->userDefaults(),$rs->options());
           
+          $this->user_prefs = new dcPrefs($this->core,$this->user_id);
+          
           # Get permissions on blogs
           if ($this->findUserBlog() === false) {

inc/core/class.dc.media.php

@@ -102 +102 @@
           
           $this->addFileHandler('image/jpeg','create',array($this,'imageMetaCreate'));
+          
+          $this->addFileHandler('image/jpeg','recreate',array($this,'imageThumbCreate'));
+          $this->addFileHandler('image/png','recreate',array($this,'imageThumbCreate'));
+          $this->addFileHandler('image/gif','recreate',array($this,'imageThumbCreate'));
           
           $this->addFileHandler('image/jpeg','recreate',array($this,'imageThumbCreate'));
@@ -904 +908 @@
           $this->callFileHandler($media_type,'recreate',null,$f->basename); // Args list to be completed as necessary (Franck)
      }
+
+     /**
+     Calls file handlers registered for recreate event
+     
+     @param    f    <b>fileItem</b>     fileItem object
+     */
+     public function mediaFireRecreateEvent($f)
+     {
+          $media_type = files::getMimeType($f->basename);
+          $this->callFileHandler($media_type,'recreate',null,$f->basename); // Args list to be completed as necessary (Franck)
+     }
      
      /* Image handlers
      ------------------------------------------------------- */
-     public function imageThumbCreate($cur,$f,$media_id,$force=true)
+     public function imageThumbCreate($cur,$f,$force=true)
      {
           $file = $this->pwd.'/'.$f;