Changeset 2478
- Timestamp:
- Aug 20, 2008, 1:58:35 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/functions.php
r2472 r2478 357 357 } 358 358 } 359 closedir($contents); 359 360 } 360 361 } … … 1497 1498 { 1498 1499 global $page; 1499 1500 1500 1501 $tag_name = trim($tag_name); 1501 1502 if (isset($page['tag_id_from_tag_name_cache'][$tag_name])) … … 1618 1619 $query = 'OPTIMIZE TABLE '.implode(', ', $all_tables).';'; 1619 1620 $mysql_rc = $mysql_rc && pwg_query($query); 1620 if ($mysql_rc) 1621 if ($mysql_rc) 1621 1622 { 1622 1623 array_push( -
trunk/include/ws_core.inc.php
r2299 r2478 345 345 var $_responseFormat; 346 346 347 var $_methods; 348 var $_methodSignatures; 347 var $_methods = array(); 349 348 350 349 function PwgServer() 351 350 { 352 $methods = array();353 351 } 354 352 … … 436 434 function addMethod($methodName, $callback, $params=array(), $description, $include_file='') 437 435 { 438 $this->_methods[$methodName] = $callback;439 $this->_methodDescriptions[$methodName] = $description;440 441 436 if (!is_array($params)) 442 437 { … … 470 465 } 471 466 } 472 $this->_methodSignatures[$methodName] = $params; 467 468 $this->_methods[$methodName] = array( 469 'callback' => $callback, 470 'description' => $description, 471 'signature' => $params, 472 'include' => $include_file, 473 ); 473 474 } 474 475 … … 480 481 function getMethodDescription($methodName) 481 482 { 482 $desc = @$this->_method Descriptions[$methodName];483 $desc = @$this->_methods[$methodName]['description']; 483 484 return isset($desc) ? $desc : ''; 484 485 } … … 486 487 function getMethodSignature($methodName) 487 488 { 488 $signature = @$this->_method Signatures[$methodName];489 $signature = @$this->_methods[$methodName]['signature']; 489 490 return isset($signature) ? $signature : array(); 490 491 } … … 518 519 function invoke($methodName, $params) 519 520 { 520 $ callback= @$this->_methods[$methodName];521 522 if ( $ callback==null )521 $method = @$this->_methods[$methodName]; 522 523 if ( $method==null ) 523 524 { 524 525 return new PwgError(WS_ERR_INVALID_METHOD, 'Method name "'.$methodName.'" is not valid'); … … 526 527 527 528 // parameter check and data coercion ! 528 $signature = @$this->_methodSignatures[$methodName];529 $signature = $method['signature']; 529 530 $missing_params = array(); 530 531 foreach($signature as $name=>$options) … … 571 572 if ( strtolower( get_class($result) )!='pwgerror') 572 573 { 573 $result = call_user_func_array($callback, array($params, &$this) ); 574 if ( !empty($method['include']) ) 575 { 576 include_once( $method['include'] ); 577 } 578 $result = call_user_func_array($method['callback'], array($params, &$this) ); 574 579 } 575 580 return $result; -
trunk/language/en_UK/common.lang.php
r2476 r2478 311 311 $lang['upload_advise_thumbnail'] = 'Optional, but recommended : choose a thumbnail to associate to '; 312 312 $lang['upload_advise_width'] = 'the width of the picture must not exceed : '; 313 $lang['upload_author'] = 'Author (eg "Pierrick LE GALL")';313 $lang['upload_author'] = 'Author'; 314 314 $lang['upload_cannot_upload'] = 'can\'t upload the picture on the server'; 315 315 $lang['upload_err_username'] = 'the username must be given'; -
trunk/language/nl_NL/common.lang.php
r2342 r2478 311 311 $lang['upload_advise_thumbnail'] = 'Optioneel, maar aanbevolen : kies een thumbnail voor associatie'; 312 312 $lang['upload_advise_width'] = 'de breedte van de afbeelding mag niet te groot zijn : '; 313 $lang['upload_author'] = 'Auteur (eg "Pierrick LE GALL")';313 $lang['upload_author'] = 'Auteur'; 314 314 $lang['upload_cannot_upload'] = 'kan de afbeelding niet op de server plaatsen'; 315 315 $lang['upload_err_username'] = 'de gebruikersnaam moet ingevuld zijn'; -
trunk/tags.php
r2409 r2478 68 68 } 69 69 70 $template->assign( 71 array( 72 'U_CLOUD' => get_root_url().'tags.php?display_mode=cloud', 73 'U_LETTERS' => get_root_url().'tags.php?display_mode=letters', 74 'display_mode' => $page['display_mode'], 75 ) 76 ); 70 foreach (array('cloud', 'letters') as $mode) 71 { 72 $template->assign( 73 'U_'.strtoupper($mode), 74 get_root_url().'tags.php'. ($conf['tags_default_display_mode']==$mode ? '' : '?display_mode='.$mode) 75 ); 76 } 77 78 $template->assign( 'display_mode', $page['display_mode'] ); 77 79 78 80 // find all tags available for the current user -
trunk/template/yoga/picture_nav_buttons.tpl
r2270 r2478 3 3 4 4 {if isset($last)} 5 <a class="navButton prev" href="{$last.U_IMG}" title="{'last_page'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'last_page'|@translate}"></a>5 <a class="navButton" href="{$last.U_IMG}" title="{'last_page'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'last_page'|@translate}"></a> 6 6 {else} 7 <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>7 <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a> 8 8 {/if} 9 9 10 10 {if isset($next)} 11 <a class="navButton next" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'next_page'|@translate}"></a>11 <a class="navButton" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'next_page'|@translate}"></a> 12 12 {else} 13 <a class="navButton next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>13 <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a> 14 14 {/if} 15 15 16 16 {if isset($slideshow.U_START_PLAY)} 17 <a class="navButton play" href="{$slideshow.U_START_PLAY}" title="{'start_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'start_play'|@translate}"></a>17 <a class="navButton" href="{$slideshow.U_START_PLAY}" title="{'start_play'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'start_play'|@translate}"></a> 18 18 {/if} 19 19 20 20 {if isset($slideshow.U_STOP_PLAY)} 21 <a class="navButton play" href="{$slideshow.U_STOP_PLAY}" title="{'stop_play'|@translate}" rel="play"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'stop_play'|@translate}"></a>21 <a class="navButton" href="{$slideshow.U_STOP_PLAY}" title="{'stop_play'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'stop_play'|@translate}"></a> 22 22 {/if} 23 23 24 24 {if isset($U_UP) and !isset($slideshow)} 25 <a class="navButton up" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>25 <a class="navButton" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a> 26 26 {/if} 27 27 28 28 {if isset($previous)} 29 <a class="navButton prev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'previous_page'|@translate}"></a>29 <a class="navButton" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'previous_page'|@translate}"></a> 30 30 {else} 31 <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>31 <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a> 32 32 {/if} 33 33 34 34 {if isset($first)} 35 <a class="navButton prev" href="{$first.U_IMG}" title="{'first_page'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'first_page'|@translate}"></a>35 <a class="navButton" href="{$first.U_IMG}" title="{'first_page'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'first_page'|@translate}"></a> 36 36 {else} 37 <a class="navButton prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>37 <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a> 38 38 {/if} 39 39 40 40 41 41 {if isset($slideshow.U_START_REPEAT)} 42 <a class="navButton repeat" href="{$slideshow.U_START_REPEAT}" title="{'start_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'start_repeat'|@translate}"></a>42 <a class="navButton" href="{$slideshow.U_START_REPEAT}" title="{'start_repeat'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'start_repeat'|@translate}"></a> 43 43 {/if} 44 44 45 45 {if isset($slideshow.U_STOP_REPEAT)} 46 <a class="navButton repeat" href="{$slideshow.U_STOP_REPEAT}" title="{'stop_repeat'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'stop_repeat'|@translate}"></a>46 <a class="navButton" href="{$slideshow.U_STOP_REPEAT}" title="{'stop_repeat'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'stop_repeat'|@translate}"></a> 47 47 {/if} 48 48 49 49 {if isset($slideshow)} 50 50 {if isset($slideshow.U_DEC_PERIOD)} 51 <a class="navButton dec_period" href="{$slideshow.U_DEC_PERIOD}" title="{'dec_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'dec_period'|@translate}"></a>51 <a class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'dec_period'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'dec_period'|@translate}"></a> 52 52 {else} 53 <a class="navButton dec_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>53 <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a> 54 54 {/if} 55 55 56 56 {if isset($slideshow.U_INC_PERIOD)} 57 <a class="navButton inc_period" href="{$slideshow.U_INC_PERIOD}" title="{'inc_period'|@translate}" rel="repeat"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'inc_period'|@translate}"></a>57 <a class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'inc_period'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'inc_period'|@translate}"></a> 58 58 {else} 59 <a class="navButton inc_period"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>59 <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a> 60 60 {/if} 61 61 {/if}
Note: See TracChangeset
for help on using the changeset viewer.