Changeset 771
- Timestamp:
- 12/21/06 20:27:35 (2 years ago)
- Files:
-
- devel/lib/templates.php (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
devel/lib/templates.php
r735 r771 667 667 global $template_id; 668 668 global $page_owner; 669 global $CFG; 669 670 670 671 global $page_template_cache; … … 697 698 // Grab the template content 698 699 if ($template_id == -1 || ($parameter['context'] != "css" && $parameter['context'] != "pageshell")) { 699 $template_element = $template[$parameter['context']]; 700 $template_element = $template[$parameter['context']]; 700 701 } else { 701 702 $template_context = addslashes($parameter['context']); … … 711 712 $template_element = $template[$parameter['context']]; 712 713 } 714 } 715 716 if (!empty($CFG->templates->variables_substitute) && (is_callable($CFG->templates->variables_substitute[$parameter['context']]) || is_array($CFG->templates->variables_substitute[$parameter['context']]))) { 717 if (is_array($CFG->templates->variables_substitute[$parameter['context']])) { 718 foreach ($CFG->templates->variables_substitute[$parameter['context']] as $sub_function) { 719 $template_element .= $sub_function($vars); 720 } 721 } else { 722 $template_element .= $CFG->templates->variables_substitute[$parameter['context']]($vars); 723 } 713 724 } 714 725 … … 1121 1132 //error_log("tvs " . print_r($template_variable,1)); 1122 1133 1134 $result = ""; 1123 1135 if (isset($variables[$template_variable])) { 1124 return$variables[$template_variable];1136 $result .= $variables[$template_variable]; 1125 1137 } else { 1126 1138 $vars = array(); … … 1133 1145 case "username": 1134 1146 if (logged_on) { 1135 return$_SESSION['username'];1147 $result = $_SESSION['username']; 1136 1148 } else { 1137 return__gettext("Guest");1149 $result = __gettext("Guest"); 1138 1150 } 1139 1151 break; 1140 1152 case "usericonid": 1141 1153 if (logged_on) { 1142 returnuser_info("icon",$_SESSION['userid']);1154 $result = user_info("icon",$_SESSION['userid']); 1143 1155 } else { 1144 return0;1156 $result = 0; 1145 1157 } 1146 1158 break; 1147 1159 case "name": 1148 1160 if (logged_on) { 1149 returnhtmlspecialchars($_SESSION['name'], ENT_COMPAT, 'utf-8');1161 $result = htmlspecialchars($_SESSION['name'], ENT_COMPAT, 'utf-8'); 1150 1162 } else { 1151 return__gettext("Guest");1163 $result = __gettext("Guest"); 1152 1164 } 1153 1165 break; 1154 1166 case "userfullname": 1155 1167 if (logged_on) { 1156 returnhtmlspecialchars($_SESSION['name'], ENT_COMPAT, 'utf-8');1168 $result = htmlspecialchars($_SESSION['name'], ENT_COMPAT, 'utf-8'); 1157 1169 } else { 1158 return__gettext("Guest") . " [<a href=\"".url."login/index.php\">" . __gettext("Log in") . "</a>]";1170 $result = __gettext("Guest") . " [<a href=\"".url."login/index.php\">" . __gettext("Log in") . "</a>]"; 1159 1171 } 1160 1172 break; 1161 1173 case "menu": 1162 1174 if (logged_on) { 1163 returntemplates_draw(array(1175 $result = templates_draw(array( 1164 1176 'menuitems' => menu_join('', $PAGE->menu), 1165 1177 'context' => 'menu' … … 1169 1181 1170 1182 case "submenu": 1171 returntemplates_draw(array(1183 $result = templates_draw(array( 1172 1184 'submenuitems' => menu_join(' | ', $PAGE->menu_sub), 1173 1185 'context' => 'submenu' … … 1177 1189 case "topmenu": 1178 1190 if (logged_on) { 1179 returntemplates_draw(array(1191 $result = templates_draw(array( 1180 1192 'topmenuitems' => menu_join('', $PAGE->menu_top), 1181 1193 'context' => 'topmenu' … … 1185 1197 1186 1198 case "url": 1187 returnurl;1199 $result = url; 1188 1200 break; 1189 1201 1190 1202 case "sitename": 1191 return$CFG->sitename;1203 $result = $CFG->sitename; 1192 1204 break; 1193 1205 1194 1206 case "tagline": 1195 return$CFG->tagline;1207 $result = $CFG->tagline; 1196 1208 break; 1197 1209 1198 1210 case "metatags": 1199 1211 // $run_result = "<link href=\"/".$template_variable.".css\" rel=\"stylesheet\" type=\"text/css\" />"; 1200 return"<style type=\"text/css\"><!--\n"1212 $result = "<style type=\"text/css\"><!--\n" 1201 1213 . templates_draw(array( 1202 1214 'template' => $template_id, … … 1214 1226 } 1215 1227 if (defined('ELGG_PERFTOFOOT') || $CFG->debug > 7 || $CFG->perfdebug > 7) { 1216 return$perf['html'];1228 $result = $perf['html']; 1217 1229 } 1218 1230 … … 1244 1256 } 1245 1257 } 1246 return $result;1258 1247 1259 break; 1248 1260 case 'people': … … 1294 1306 END; 1295 1307 } 1296 return $result;1308 1297 1309 break; 1298 1310 … … 1316 1328 $tag_count++; 1317 1329 } 1318 return $result;1330 1319 1331 break; 1320 1332 case "populartags": … … 1345 1357 $tag_count++; 1346 1358 } 1347 return $result;1359 1348 1360 break; 1349 1361 default: 1350 if (!empty($CFG->templates->variables_substitute) && is_callable($CFG->templates->variables_substitute[$template_variable])) { 1351 return $CFG->templates->variables_substitute[$template_variable]($vars); 1352 } 1353 break; 1354 1355 } 1356 } 1362 break; 1363 1364 } 1365 } 1366 if (!empty($CFG->templates->variables_substitute) && (is_callable($CFG->templates->variables_substitute[$template_variable]) || is_array($CFG->templates->variables_substitute[$template_variable]))) { 1367 if (is_array($CFG->templates->variables_substitute[$template_variable])) { 1368 foreach ($CFG->templates->variables_substitute[$template_variable] as $sub_function) { 1369 $result .= $sub_function($vars); 1370 } 1371 } else { 1372 $result .= $CFG->templates->variables_substitute[$template_variable]($vars); 1373 } 1374 } 1375 $run_result .= $result; 1357 1376 return $run_result; 1358 1377 }
