Changeset 1391

Show
Ignore:
Timestamp:
12/06/07 15:26:45 (1 year ago)
Author:
rho
Message:

code cleanup

Signed-off: Rolando Espinoza La fuente <rho@prosoftpeople.com>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • devel/mod/blog/action_redirection.php

    r1077 r1391  
    88        run("weblogs:init"); 
    99 
    10         global $redirect_url; 
    11         global $messages; 
    12  
    13         if (isset($messages) && sizeof($messages) > 0) { 
    14             $_SESSION['messages'] = $messages; 
    15         } 
    16  
    17         if (defined('redirect_url')) { 
    18             header("Location: " . redirect_url); 
    19         } else { 
    20             header("Location: " . url); 
    21         } 
     10        header_redirect((defined('redirect_url') ? redirect_url : url)); 
    2211 
    2312?> 
  • devel/mod/blog/archive.php

    r1369 r1391  
    1515        templates_page_setup(); 
    1616 
    17         $type = gettext("Blog"); 
    18         if(is_array($CFG->weblog_extensions[$extensionContext]) &&array_key_exists('name',$CFG->weblog_extensions[$extensionContext])){ 
    19           $type = $CFG->weblog_extensions[$extensionContext]['name']; 
    20         } 
     17        $type = blog_get_extension_name($extensionContext); 
    2118 
    2219        $title = run("profile:display:name") . " :: ".$type ." :: ". __gettext("Archives"); 
  • devel/mod/blog/archive_month.php

    r1369 r1391  
    1515        templates_page_setup(); 
    1616 
    17         $type = gettext("Blog"); 
    18         if(is_array($CFG->weblog_extensions[$extensionContext]) &&array_key_exists('name',$CFG->weblog_extensions[$extensionContext])){ 
    19           $type = $CFG->weblog_extensions[$extensionContext]['name']; 
    20         } 
     17        $type = blog_get_extension_name($extensionContext); 
    2118 
    2219        $title = run("profile:display:name") . " :: ".$type ." :: ". __gettext("Archives"); 
  • devel/mod/blog/default_template.php

    r1332 r1391  
    11<?php 
    2  
    3     global $template; 
    4     global $template_definition; 
    52 
    63    templates_add_context('weblogpost', 'mod/blog/templates/blog_post.html'); 
  • devel/mod/blog/edit.php

    r1369 r1391  
    99        run("profile:init"); 
    1010        run("friends:init"); 
     11 
     12        require_login(); 
    1113 
    1214        global $page_owner; 
     
    2426        templates_page_setup(); 
    2527 
    26         $type = (is_array($CFG->weblog_extensions)  
    27                                 && is_array($CFG->weblog_extensions[$extensionContext])  
    28                                 && array_key_exists('name',$CFG->weblog_extensions[$extensionContext]))? 
    29                 $CFG->weblog_extensions[$extensionContext]['name'] 
    30                 :__gettext("Blog"); 
     28        $type = blog_get_extension_name($extensionContext); 
    3129 
    3230        $title = run("profile:display:name") . " :: " . $type; 
  • devel/mod/blog/everyone.php

    r1369 r1391  
    1515        templates_page_setup(); 
    1616 
    17         $type = gettext("Blog"); 
    18         if(is_array($CFG->weblog_extensions[$extensionContext]) &&array_key_exists('name',$CFG->weblog_extensions[$extensionContext])){ 
    19           $type = $CFG->weblog_extensions[$extensionContext]['name']; 
    20         } 
     17        $type = blog_get_extension_name($extensionContext); 
     18 
    2119        $title = $type." :: ".__gettext("All"); 
    2220 
  • devel/mod/blog/friends.php

    r1369 r1391  
    1515        templates_page_setup(); 
    1616 
    17         $type = __gettext("Friends blog"); 
    18         if(is_array($CFG->weblog_extensions[$extensionContext]) &&array_key_exists('name',$CFG->weblog_extensions[$extensionContext])){ 
    19           $type = $CFG->weblog_extensions[$extensionContext]['name']." :: ".  __gettext("Friends"); 
    20         } 
     17        $type = blog_get_extension_name($extensionContext); 
    2118 
    2219        $title = run("profile:display:name") . " :: ". $type; 
  • devel/mod/blog/index.php

    r1369 r1391  
    1515        templates_page_setup(); 
    1616 
    17         $type = gettext("Blog"); 
    18         if(is_array($CFG->weblog_extensions[$extensionContext]) &&array_key_exists('name',$CFG->weblog_extensions[$extensionContext])){ 
    19           $type = $CFG->weblog_extensions[$extensionContext]['name']; 
    20         } 
     17        $type = blog_get_extension_name($extensionContext); 
    2118 
    2219        $title = run("profile:display:name") . " :: " . $type; 
  • devel/mod/blog/interesting.php

    r1369 r1391  
    1515templates_page_setup(); 
    1616 
    17 $type = __gettext("Interesting posts"); 
    18 if(is_array($CFG->weblog_extensions[$extensionContext]) &&array_key_exists('name',$CFG->weblog_extensions[$extensionContext])){ 
    19   $type = $CFG->weblog_extensions[$extensionContext]['name']. " :: ". __gettext("Interesting"); 
    20 
    21 $title = run("profile:display:name") . " :: ". $type; 
     17$type = blog_get_extension_name($extensionContext); 
     18 
     19$title = run("profile:display:name") . " :: ". $type . " :: " . __gettext('Interesting'); 
    2220 
    2321$body = run("content:weblogs:view"); 
  • devel/mod/blog/lib.php

    r1346 r1391  
    671671 
    672672} 
     673 
     674/** 
     675 * Return extension context name 
     676 * 
     677 * @param string $name extension context 
     678 */ 
     679function blog_get_extension_name($extension=null) { 
     680    global $CFG; 
     681 
     682    if (!isset($extension)) { 
     683        // get from param 
     684        $extension = trim(optional_param('extension', 'weblog')); 
     685    } 
     686 
     687    if (isset($CFG->weblog_extensions[$extension]) && 
     688        is_array($CFG->weblog_extensions[$extension]) && 
     689        array_key_exists('name',$CFG->weblog_extensions[$extension])) { 
     690        // get extension context 
     691        $type = $CFG->weblog_extensions[$extension]['name']; 
     692    } 
     693 
     694    return isset($type) ? $type : __gettext('Blog'); 
     695} 
    673696?> 
  • devel/mod/blog/view_post.php

    r1369 r1391  
    3939    $page_owner = $post->weblog; 
    4040 
    41     $type = gettext("Blog"); 
    42     if(is_array($CFG->weblog_extensions[$extensionContext]) &&array_key_exists('name',$CFG->weblog_extensions[$extensionContext])){ 
    43        $type = $CFG->weblog_extensions[$extensionContext]['name']; 
    44     } 
     41    $type = blog_get_extension_name($extensionContext); 
    4542 
    4643    $title = run("profile:display:name") . " :: " . $type . " :: " . stripslashes($post->title);