Improving using of twig instead of loading in PHP

main/messages/inbox.php

@@ -169,11 +169,11 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('social_left_menu', $social_left_menu);
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $content = $tpl->fetch($social_layout);
+    $tpl->display($social_layout);
 } else {
     $content = $social_right_content;
-}
     $tpl->assign('actions', $actions);
     $tpl->assign('message', $show_message);
     $tpl->assign('content', $content);
     $tpl->display_one_col_template();
+}

main/messages/new_message.php

@@ -358,11 +358,11 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('social_left_menu', $social_left_menu);
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $content = $tpl->fetch($social_layout);
+    $tpl->display($social_layout);
 } else {
     $content = $social_right_content;
-}
     $tpl->assign('actions', $actions);
     $tpl->assign('message', $show_message);
     $tpl->assign('content', $content);
     $tpl->display_one_col_template();
+}

main/messages/outbox.php

@@ -156,11 +156,11 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('social_left_menu', $social_left_menu);
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $content = $tpl->fetch($social_layout);
+    $tpl->display($social_layout);
 } else {
     $content = $social_right_content;
-}
     $tpl->assign('actions', $actions);
     $tpl->assign('message', $show_message);
     $tpl->assign('content', $content);
     $tpl->display_one_col_template();
+}

main/messages/view_message.php

@@ -82,12 +82,12 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->assign('social_left_menu', $social_left_menu);
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $content = $tpl->fetch($social_layout);
+    $tpl->display($social_layout);
 } else {
     $content = $social_right_content;
-}
 
     $tpl->assign('actions', $actions);
     $tpl->assign('message', $show_message);
     $tpl->assign('content', $content);
     $tpl->display_one_col_template();
+}

main/social/friends.php

@@ -142,11 +142,8 @@ $social_right_content .= '</div>';
 
 $tpl = new Template(get_lang('Social'));
 $tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $message);
-$tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/group_add.php

@@ -117,9 +117,7 @@ $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
-$tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/group_edit.php

@@ -150,9 +150,9 @@ $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);
+

main/social/group_invitation.php

@@ -538,9 +538,9 @@ $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
+
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/group_members.php

@@ -124,16 +124,14 @@ if (count($new_member_list) > 0) {
 }
 $social_right_content .= '</div>';
 
-
-
 $tpl = new Template($tool_name);
 $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);
+

main/social/group_topics.php

@@ -195,9 +195,8 @@ $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/group_waiting_list.php

@@ -107,9 +107,9 @@ $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
+
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/groups.php

@@ -33,7 +33,7 @@ if (isset($_GET['anchor_topic'])) {
 	}
 	$anchor = 'topic_'.$match[1];
 }
-$htmlHeadXtra[] = '<script type="text/javascript"> 
+$htmlHeadXtra[] = '<script>
 
 var counter_image = 1;
 function remove_image_form(id_elem1) {
@@ -531,9 +531,9 @@ $tpl->set_help('Groups');
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
+
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/home.php

@@ -60,8 +60,7 @@ $user_info = UserManager :: get_user_info_by_id(api_get_user_id());
 
 $social_left_content = SocialManager::show_social_menu('home');
 
-$social_right_content .= '<div class="span5">';
-
+$social_right_content = '<div class="span5">';
 $social_right_content .= '<div class="well_border">';
 $social_right_content .= '<h3>'.get_lang('ContactInformation').'</h3>';
 
@@ -165,11 +164,6 @@ $social_right_content .= '</div>';
 
 $tpl = new Template(get_lang('SocialNetwork'));
 $tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
 $social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
-$tpl->assign('actions', $actions);
-$tpl->assign('message', $message);
-$tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$tpl->display($social_layout);

main/social/invitations.php

@@ -192,9 +192,9 @@ $tpl = new Template($tool_name);
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
+
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/myfiles.php

@@ -105,9 +105,9 @@ $tpl = new Template();
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
+
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $show_message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/profile.php

@@ -681,9 +681,9 @@ $tpl = new Template(get_lang('Social'));
 $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_left_menu', $social_left_menu);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
+
 $tpl->assign('actions', $actions);
 $tpl->assign('message', $message);
 $tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$social_layout = $tpl->get_template('layout/social_layout.tpl');
+$tpl->display($social_layout);

main/social/search.php

@@ -157,11 +157,9 @@ if ($query !='') {
 
 $tpl = new Template($tool_name);
 $tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_left_menu', $social_left_menu);
+
 $tpl->assign('social_right_content', $social_right_content);
+
+
 $social_layout = $tpl->get_template('layout/social_layout.tpl');
-$content = $tpl->fetch($social_layout);
-$tpl->assign('actions', $actions);
-$tpl->assign('message', $show_message);
-$tpl->assign('content', $content);
-$tpl->display_one_col_template();
+$tpl->display($social_layout);

main/social/skills_ranking.php

@@ -61,4 +61,3 @@ $content .= $tpl->fetch('default/skill/skill_ranking.tpl');
 $tpl->assign('content', $content);
 
 $tpl->display_one_col_template();
-