Changeset 1395

Timestamp:

12/06/07 16:16:12 (1 year ago)

Author:

rho

Message:

cleanup

Files:

• devel/mod/blog/archive.php (modified) (1 diff)
• devel/mod/blog/archive_month.php (modified) (1 diff)
• devel/mod/blog/edit.php (modified) (1 diff)
• devel/mod/blog/everyone.php (modified) (1 diff)
• devel/mod/blog/friends.php (modified) (1 diff)
• devel/mod/blog/index.php (modified) (1 diff)
• devel/mod/blog/interesting.php (modified) (1 diff)
• devel/mod/blog/lib.php (modified) (2 diffs)
• devel/mod/blog/lib/weblogs_actions.php (modified) (2 diffs)
• devel/mod/blog/lib/weblogs_posts_add.php (modified) (1 diff)
• devel/mod/blog/lib/weblogs_posts_edit.php (modified) (1 diff)
• devel/mod/blog/lib/weblogs_posts_view.php (modified) (1 diff)
• devel/mod/blog/view_post.php (modified) (1 diff)

devel/mod/blog/archive.php

@@ -15 +15 @@
-        templates_page_setup();
-
-_name($extensionContext
+($extensionContext, 'name'
-
-        $title = run("profile:display:name") . " :: ".$type ." :: ". __gettext("Archives");

devel/mod/blog/archive_month.php

@@ -15 +15 @@
-        templates_page_setup();
-
-_name($extensionContext
+($extensionContext, 'name'
-
-        $title = run("profile:display:name") . " :: ".$type ." :: ". __gettext("Archives");

devel/mod/blog/edit.php

@@ -26 +26 @@
-        templates_page_setup();
-
-_name($extensionContext
+($extensionContext, 'name'
-
-        $title = run("profile:display:name") . " :: " . $type;

devel/mod/blog/everyone.php

@@ -15 +15 @@
-        templates_page_setup();
-
-_name($extensionContext
+($extensionContext, 'name'
-
-        $title = $type." :: ".__gettext("All");

devel/mod/blog/friends.php

@@ -15 +15 @@
-        templates_page_setup();
-
-_name($extensionContext
+($extensionContext, 'name'
-
-        $title = run("profile:display:name") . " :: ". $type;

devel/mod/blog/index.php

@@ -15 +15 @@
-        templates_page_setup();
-
-_name($extensionContext
+($extensionContext, 'name'
-
-        $title = run("profile:display:name") . " :: " . $type;

devel/mod/blog/interesting.php

@@ -15 +15 @@
-templates_page_setup();
-
-_name($extensionContext
+($extensionContext, 'name'
-
-$title = run("profile:display:name") . " :: ". $type . " :: " . __gettext('Interesting');

devel/mod/blog/lib.php

@@ -677 +677 @@
- * @param string $name extension context
- */
-_name($extension
+($extension=null, $prop=null, $default
-    global $CFG;
-
@@ -684 +684 @@
-        $extension = trim(optional_param('extension', 'weblog'));
-    }
+    if (!isset($prop)) {
+        $prop = 'name';
+    }
+
+    if ($prop == 'name') {
+        $_default = __gettext('Blog');
+    } else {
+        $_default = null;
+    }
+
+    $default = (isset($default)) ? $default : $_default;
-
-    if (isset($CFG->weblog_extensions[$extension]) &&
-        is_array($CFG->weblog_extensions[$extension]) &&
-'name'
+$prop
-        // get extension context
-'name'
-
-
-__gettext('Blog')
+$prop
+
+
+$default
-}
-?>

devel/mod/blog/lib/weblogs_actions.php

@@ -45 +45 @@
-                $rssresult = run("weblogs:rss:publish", array($page_owner, false));
-                $rssresult = run("profile:rss:publish", array($page_owner, false));
-
-
-
-
-
+
-
-                if (user_type($post->weblog) == "person") {
@@ -248 +244 @@
-
-if (defined('redirect_url')) {
-
-
-
-
-
+
-}
-

devel/mod/blog/lib/weblogs_posts_add.php

@@ -23 +23 @@
-      $messages[] = __gettext("You can modify only your own content!");
-      $redirect_url = url . user_info('username', $_SESSION['userid']) . "/$extensionContext/";
-
-
-
+
-    }
-
-
-
-
-
-
-
+
+
+
-
-    $contentTitle = trim(optional_param('title'));

devel/mod/blog/lib/weblogs_posts_edit.php

@@ -17 +17 @@
-    $messages[] = __gettext("You can modify only your own content!");
-    $redirect_url = url . user_info('username', $_SESSION['userid']) . "/$extensionContext/";
-
-
+
-}
-
-
-
+
+
+
+
+
+
-if(is_array($CFG->weblog_extensions) && array_key_exists($extensionContext,$CFG->weblog_extensions) && is_array($CFG->weblog_extensions[$extensionContext])){
- echo "DENTRO";
-  $contentType  = (array_key_exists('type',$CFG->weblog_extensions[$extensionContext])) ? $CFG->weblog_extensions[$extensionContext]['type'] : $contentType;
-  $extraType  = (array_key_exists('type',$CFG->weblog_extensions[$extensionContext])) ? $CFG->weblog_extensions[$extensionContext]['type'] : '';
-  $extraField = (array_key_exists('field',$CFG->weblog_extensions[$extensionContext])) ? $CFG->weblog_extensions[$extensionContext]['field'] : '';
-  $extraValue = (array_key_exists('values',$CFG->weblog_extensions[$extensionContext])) ? $CFG->weblog_extensions[$extensionContext]['values'] : '';
-  if(array_key_exists('extra_type',$CFG->weblog_extensions[$extensionContext])){
-    $extraTypes = $CFG->weblog_extensions[$extensionContext]['extra_type'];
-  }
-  else{
-    $extraTypes = array();
-  }
-
-  $extraSelected = "";

devel/mod/blog/lib/weblogs_posts_view.php

@@ -96 +96 @@
-    //Getting the field from the context extension
-    $extensionContext = trim(optional_param('extension','weblog'));
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-    $body = run("weblogs:text:process", $post->body);

devel/mod/blog/view_post.php

@@ -39 +39 @@
-    $page_owner = $post->weblog;
-
-_name($extensionContext
+($extensionContext, 'name'
-
-    $title = run("profile:display:name") . " :: " . $type . " :: " . stripslashes($post->title);