Changeset 30:ea0c606bab6f
- Timestamp:
- 04/27/11 21:45:55 (14 years ago)
- Branch:
- userprefs
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/preferences.php
r26 r30 35 35 $default_tab = 'user-profile'; 36 36 37 if (!empty($_GET['append']) || !empty($_GET['removed']) || !empty($_GET['neworder']) ) {37 if (!empty($_GET['append']) || !empty($_GET['removed']) || !empty($_GET['neworder']) || !empty($_GET['replaced'])) { 38 38 $default_tab = 'user-favorites'; 39 39 } elseif (!empty($_GET['updated'])) { … … 265 265 } 266 266 267 # Replace default favorites by current set (super admin only) 268 if (!empty($_POST['replace']) && $core->auth->isSuperAdmin()) { 269 try { 270 $ws = $core->auth->user_prefs->addWorkspace('favorites'); 271 $user_favs = $ws->DumpLocalPrefs(); 272 $def_favs = $ws->DumpGlobalPrefs(); 273 foreach ($def_favs as $k => $v) 274 { 275 $core->auth->user_prefs->favorites->drop($k,true); 276 } 277 $count = 0; 278 foreach ($user_favs as $k => $v) 279 { 280 $uid = sprintf("g%03s",$count); 281 $f = unserialize($v['value']); 282 $fav = array('name' => $f['name'],'title' => $f['title'],'url' => $f['url'],'small-icon' => $f['small-icon'], 283 'large-icon' => $f['large-icon'],'permissions' => $f['permissions'],'id' => $f['id'],'class' => $f['class']); 284 $core->auth->user_prefs->favorites->put($uid,serialize($fav),'string',null,null,true); 285 $count++; 286 } 287 } catch (Exception $e) { 288 $core->error->add($e->getMessage()); 289 } 290 291 if (!$core->error->flag()) { 292 http::redirect('preferences.php?&replaced=1'); 293 } 294 } 267 295 268 296 /* DISPLAY … … 292 320 if (!empty($_GET['removed'])) { 293 321 echo '<p class="message">'.__('Favorites have been successfully removed.').'</p>'; 322 } 323 if (!empty($_GET['replaced'])) { 324 echo '<p class="message">'.__('Default favorites have been successfully updated.').'</p>'; 294 325 } 295 326 … … 444 475 '<p class="col">'.form::hidden('favs_order',''). 445 476 $core->formNonce(). 446 '<input type="submit" name="saveorder" value="'.__('Save order').'"></p>'. 477 '<input type="submit" name="saveorder" value="'.__('Save order').'">'. 478 ($core->auth->isSuperAdmin() ? ' <input type="submit" name="replace" value="'.__('Define as default favorites').'">' : ''). 479 '</p>'. 447 480 448 481 '<p class="right"><input type="submit" class="delete" name="removeaction"'. -
inc/core/class.dc.workspace.php
r13 r30 264 264 265 265 @param id <b>string</b> Pref ID 266 */ 267 public function drop($id) 266 @param force_global <b>boolean</b> Force global pref drop 267 */ 268 public function drop($id,$force_global=false) 268 269 { 269 270 if (!$this->ws) { … … 273 274 $strReq = 'DELETE FROM '.$this->table.' '; 274 275 275 if ( $this->user_id === null) {276 if (($force_global) || ($this->user_id === null)) { 276 277 $strReq .= 'WHERE user_id IS NULL '; 277 278 $global = true; -
locales/fr/main.po
r27 r30 2722 2722 msgid "Display quick entry form" 2723 2723 msgstr "Afficher le formulaire de billet rapide" 2724 2725 msgid "Default favorites have been successfully updated." 2726 msgstr "Les favoris par défaut ont été enregistrés avec succès." 2727 2728 msgid "Define as default favorites" 2729 msgstr "Definir comme favoris par défaut"
Note: See TracChangeset
for help on using the changeset viewer.