Skip to content

Commit

Permalink
make glue_version() more flexible
Browse files Browse the repository at this point in the history
remove unnecessary closing php tag at the end of files
  • Loading branch information
gohai committed Mar 10, 2011
1 parent 557da7c commit 5492508
Show file tree
Hide file tree
Showing 22 changed files with 2 additions and 68 deletions.
5 changes: 1 addition & 4 deletions common.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ function glue_version()
$a = expl('.', HOTGLUE_VERSION);
$ret = array(0, 0, 0);
for ($i=0; $i < count($a); $i++) {
$ret[$i] = $a[$i];
$ret[$i] = intval($a[$i]);
}
return $ret;
}
Expand Down Expand Up @@ -633,6 +633,3 @@ function valid_pagename($s)
return true;
}
}


?>
5 changes: 1 addition & 4 deletions config.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@define('DEFAULT_PAGE', 'start');
@define('DEFAULT_TO_EDIT', false); // edit pages by default
@define('FAVICON', 'img/favicon.ico'); // can be empty or an absolute url
@define('HOTGLUE_VERSION', '1.0.2'); // expected api.version.patchlevel
@define('HOTGLUE_VERSION', '1.0.3pre'); // expected api.version.patchlevel
@define('IE8_COMPAT', true); // try to be compatible with Internet Explorer 8 in viewing mode (also make sure that TEXT_USE_WOFF_FONTS is set to false)
@define('JQUERY', 'js/jquery-1.5.1.min.js');// can be an absolute url
@define('LOCK_TIME', 5000); // maximum time in ms to wait for an object lock
Expand Down Expand Up @@ -90,6 +90,3 @@ function base_url()

return $base_url_cached;
}


?>
3 changes: 0 additions & 3 deletions controller.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,3 @@ function serve_resource($s, $dl)
}

register_hook('serve_resource', 'serve resources associated with objects');


?>
3 changes: 0 additions & 3 deletions html.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,3 @@ function html_title()
$html['header']['title'] = func_get_arg(0);
}
}


?>
3 changes: 0 additions & 3 deletions html_parse.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,3 @@ function html_parse_elem($html, $recursive = false)

return $ret;
}


?>
3 changes: 0 additions & 3 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@
log_msg('info', 'index: query arguments '.var_dump_inl($args));
log_msg('debug', 'index: base url is '.quot(base_url()));
invoke_controller($args);


?>
3 changes: 0 additions & 3 deletions json.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,3 @@
log_msg('debug', 'json: service returned '.var_dump_inl($ret['#data']));
}
echo json_encode($ret);


?>
3 changes: 0 additions & 3 deletions log.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,3 @@ function log_msg($level, $msg )

// we need no extra function to log response-arrays as they are logged further
// down in the server (e.g. json.php)


?>
3 changes: 0 additions & 3 deletions module_download.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,3 @@ function download_upload_fallback($args)
return $ret['#data'];
}
}


?>
3 changes: 0 additions & 3 deletions module_glue.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -1504,6 +1504,3 @@ function upload_references($args)

register_service('glue.upload_references', 'upload_references', array('auth'=>true));
register_hook('has_reference', 'check if an object references an uploaded file');


?>
3 changes: 0 additions & 3 deletions module_iframe.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,3 @@ function iframe_save_state($args)
return true;
}
}


?>
3 changes: 0 additions & 3 deletions module_image.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,3 @@ function image_upload($args)
return $ret['#data'];
}
}


?>
3 changes: 0 additions & 3 deletions module_object.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,3 @@ function object_render_page_early($args)
html_add_js_var('$.glue.conf.object.default_colors', expl(' ', OBJECT_DEFAULT_COLORS));
}
}


?>
3 changes: 0 additions & 3 deletions module_page.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,3 @@ function page_upload($args)
return true;
}
}


?>
3 changes: 0 additions & 3 deletions module_page_browser.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,3 @@ function page_browser_render_page_early($args)
}
}
}


?>
3 changes: 0 additions & 3 deletions module_revisions_browser.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,3 @@ function revisions_browser_render_page_early($args)
}
}
}


?>
3 changes: 0 additions & 3 deletions module_text.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,3 @@ function text_save_state($args)
return true;
}
}


?>
3 changes: 0 additions & 3 deletions module_user_css.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,3 @@ function user_css_set_css($args)
}

register_service('user_css.set_css', 'user_css_set_css', array('auth'=>true));


?>
3 changes: 0 additions & 3 deletions module_video.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,3 @@ function video_upload($args)
return $ret['#data'];
}
}


?>
3 changes: 0 additions & 3 deletions module_webvideo.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,3 @@ function webvideo_save_state($args)
return true;
}
}


?>
3 changes: 0 additions & 3 deletions modules.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,3 @@ function run_service($service, $args = array())
log_msg('info', 'modules: running service '.quot($service));
return $services[$service]['func']($args);
}


?>
3 changes: 0 additions & 3 deletions util.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,3 @@ function var_dump_inl($var)
} while (0 < $cnt);
return trim($ret);
}


?>

0 comments on commit 5492508

Please sign in to comment.