Skip to content

Commit e8078b0

Browse files
CopypengCopypeng
committed
修改marker，增加用户组，表单增加qq与微信号
1 parent 6108d9a commit e8078b0

18 files changed

+81
-16
lines changed

‎add.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
$student_work = mysql_real_escape_string(parseInput($_POST['student_work']));
77
$email = mysql_real_escape_string(parseInput($_POST['email']));
88
$phone_number = mysql_real_escape_string(parseInput($_POST['phone_number']));
9+
$qq_number = mysql_real_escape_string(parseInput($_POST['qq_number']));
10+
$wechat_number = mysql_real_escape_string(parseInput($_POST['wechat_number']));
911
$name = mysql_real_escape_string(parseInput($_POST['name']));
1012
$type = mysql_real_escape_string(parseInput($_POST['type']));
1113
$address = mysql_real_escape_string(parseInput($_POST['address']));
@@ -32,7 +34,7 @@
3234

3335
} else {
3436
// insert into db, wait for approval
35-
$insert = mysql_query("INSERT INTO places (approved, name, type, address, uri, description, employer_name, student_work, phone_number, position, email) VALUES (null, '$name', '$type', '$address', '$uri', '$description', '$employer_name', '$student_work', '$phone_number', '$position', '$email')") or die(mysql_error());
37+
$insert = mysql_query("INSERT INTO places (approved, name, type, address, uri, description, employer_name, student_work, phone_number, qq_number, wechat_number, position, email) VALUES (null, '$name', '$type', '$address', '$uri', '$description', '$employer_name', '$student_work', '$phone_number', '$qq_number', '$wechat_number', '$position', '$email')") or die(mysql_error());
3638

3739
// geocode new submission
3840
$hide_geocode_output = true;

‎admin/edit.php

+20-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
$position = str_replace( "'", "\\'", str_replace( "\\", "\\\\", $_POST['position'] ) );
2727
$student_work = str_replace( "'", "\\'", str_replace( "\\", "\\\\", $_POST['student_work'] ) );
2828
$phone_number = str_replace( "'", "\\'", str_replace( "\\", "\\\\", $_POST['phone_number'] ) );
29+
$qq_number = str_replace( "'", "\\'", str_replace( "\\", "\\\\", $_POST['qq_number'] ) );
30+
$wechat_number = str_replace( "'", "\\'", str_replace( "\\", "\\\\", $_POST['wechat_number'] ) );
2931
$email = $_POST['email'];
3032
$lat = (float) $_POST['lat'];
3133
$lng = (float) $_POST['lng'];
3234

33-
mysql_query("UPDATE places SET name='$name', type='$type', address='$address', uri='$uri', lat='$lat', lng='$lng', description='$description', employer_name='$employer_name', student_work='$student_work', phone_number='$phone_number', position='$position', email='$email' WHERE id='$place_id' LIMIT 1") or die(mysql_error());
35+
mysql_query("UPDATE places SET name='$name', type='$type', address='$address', uri='$uri', lat='$lat', lng='$lng', description='$description', employer_name='$employer_name', student_work='$student_work', phone_number='$phone_number', qq_number='$qq_number', wechat_number='$wechat_number', position='$position', email='$email' WHERE id='$place_id' LIMIT 1") or die(mysql_error());
3436

3537
// geocode
3638
//$hide_geocode_output = true;
@@ -58,10 +60,17 @@
5860
<label class="col-sm-2 control-label">入学年份</label>
5961
<div class="col-sm-4">
6062
<select class="input form-control" name="type">
63+
<option<? if($place[type] == "2010") {?> selected="selected"<? } ?>>2010</option>
6164
<option<? if($place[type] == "2009") {?> selected="selected"<? } ?>>2009</option>
6265
<option<? if($place[type] == "2008") {?> selected="selected"<? } ?>>2008</option>
6366
<option<? if($place[type] == "2007") {?> selected="selected"<? } ?>>2007</option>
6467
<option<? if($place[type] == "2006") {?> selected="selected"<? } ?>>2006</option>
68+
<option<? if($place[type] == "2005") {?> selected="selected"<? } ?>>2005</option>
69+
<option<? if($place[type] == "2004") {?> selected="selected"<? } ?>>2004</option>
70+
<option<? if($place[type] == "2003") {?> selected="selected"<? } ?>>2003</option>
71+
<option<? if($place[type] == "2002") {?> selected="selected"<? } ?>>2002</option>
72+
<option<? if($place[type] == "2001") {?> selected="selected"<? } ?>>2001</option>
73+
<option<? if($place[type] == "2000") {?> selected="selected"<? } ?>>2000</option>
6574
<option<? if($place[type] == "other") {?> selected="selected"<? } ?>>other</option>
6675
</select>
6776
</div>
@@ -98,6 +107,16 @@
98107
<input type="text" class="input form-control" name="address" value="<?=$place[address]?>" id="add_address">
99108
</div>
100109
</div>
110+
<div class="form-group">
111+
<label class="col-sm-2 control-label">QQ号码</label>
112+
<div class="col-sm-4">
113+
<input type="text" class="input form-control" name="qq_number" value="<?=$place[qq_number]?>">
114+
</div>
115+
<label class="col-sm-2 control-label">微信号</label>
116+
<div class="col-sm-4">
117+
<input type="text" class="input form-control" name="wechat_number" value="<?=$place[wechat_number]?>">
118+
</div>
119+
</div>
101120
<div class="form-group">
102121
<label class="col-sm-2 control-label" for="add_uri">个人主页url</label>
103122
<div class="col-sm-10">

‎admin/toexcel.php

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
$mysqli = new mysqli("localhost","username","password","dbname");
3+
$mysqli = new mysqli("localhost","","","");
44
// Get data from the database.
55
$sql = "SELECT * FROM places";
66
// Grab the records
@@ -46,7 +46,7 @@
4646

4747

4848
if ($type == 'csv') {
49-
echo "姓名,入学年份,地址,工作单位,职务,电话,电子邮件\n";
49+
echo "姓名,入学年份,地址,工作单位,职务,电话,QQ号码,微信号,电子邮件\n";
5050

5151
// Then loop over the results, keeping commas in between the records.
5252
// Something to consider:
@@ -58,6 +58,8 @@
5858
echo $row['employer_name'] . ",";
5959
echo $row['position'] . ",";
6060
echo $row['phone_number'] . ",";
61+
echo $row['qq_number'] . ",";
62+
echo $row['wechat_number'] . ",";
6163
echo $row['email'];
6264
echo "\n";
6365
}
@@ -74,6 +76,8 @@
7476
<th>工作单位</th>
7577
<th>职务</th>
7678
<th>电话</th>
79+
<th>QQ号码</th>
80+
<th>微信号</th>
7781
<th>电子邮件</th>
7882
</tr>
7983
<?php
@@ -86,6 +90,8 @@
8690
<td><?php echo $row['employer_name'];?></td>
8791
<td><?php echo $row['position'];?></td>
8892
<td><?php echo $row['phone_number'];?></td>
93+
<td><?php echo $row['qq_number'];?></td>
94+
<td><?php echo $row['wechat_number'];?></td>
8995
<td><?php echo $row['email'];?></td>
9096
</tr>
9197
<?php

‎db/places.sql

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ CREATE TABLE IF NOT EXISTS `places` (
1212
`position` varchar(100) DEFAULT NULL,
1313
`student_work` varchar(100) NOT NULL,
1414
`phone_number` varchar(100) DEFAULT NULL,
15+
`qq_number` varchar(100) DEFAULT NULL,
16+
`wechat_number` varchar(100) DEFAULT NULL,
1517
`email` varchar(100) NOT NULL,
1618
PRIMARY KEY (`id`),
1719
UNIQUE KEY `id` (`id`)

‎images/icons/2000.png

1.13 KB
Loading

‎images/icons/2001.png

1.12 KB
Loading

‎images/icons/2002.png

1.11 KB
Loading

‎images/icons/2003.png

1.12 KB
Loading

‎images/icons/2004.png

1.11 KB
Loading

‎images/icons/2005.png

1.13 KB
Loading

‎images/icons/2006.png

-1.32 KB
Loading

‎images/icons/2007.png

-1.08 KB
Loading

‎images/icons/2008.png

-1.38 KB
Loading

‎images/icons/2009.png

-1.29 KB
Loading

‎images/icons/2010.png

1.1 KB
Loading

‎images/icons/other.png

-768 Bytes
Loading

‎index.php

+47-11
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050

5151
// resize marker list to fit window
5252
function resizeList() {
53-
newHeight = $('html').height() - $('#footerbar').height();
54-
$('#list').css('height', newHeight + "px");
55-
$('#menu').css('margin-top', $('#footerbar').height());
53+
newHeight = $('html').height() - $('#footerbar').height() - $('.wrapper').height() - 9;
54+
$('#list').css('height', newHeight + "px");
55+
$('#menuRight').css('margin-bottom', $('#footerbar').height());
5656
}
5757

5858

@@ -134,10 +134,17 @@ function initialize() {
134134
markers = new Array();
135135
<?php
136136
$types = Array(
137+
Array('2010', '2010级'),
137138
Array('2009', '2009级'),
138-
Array('2008','2008级'),
139+
Array('2008', '2008级'),
139140
Array('2007', '2007级'),
140141
Array('2006', '2006级'),
142+
Array('2005', '2005级'),
143+
Array('2004', '2004级'),
144+
Array('2003', '2003级'),
145+
Array('2002', '2002级'),
146+
Array('2001', '2001级'),
147+
Array('2000', '2000级'),
141148
Array('other', '更早...'),
142149
);
143150
$marker_id = 0;
@@ -345,6 +352,7 @@ function markerListMouseOut(marker_id) {
345352
<a href="./"><img src="./images/OUC-logo.png" alt="中国海洋大学校友地图"></a>
346353
</div>
347354
<h3>中国海洋大学校友地图</h3>
355+
<h4>—— 团干分会</h4>
348356
<p>To connect and unite the past students of OUC</p>
349357
<div class="buttons">
350358
<button type="button" class="btn btn-danger" data-toggle="modal" data-target="#modal_add">+ 加入</button>
@@ -359,10 +367,17 @@ function markerListMouseOut(marker_id) {
359367
<ul class="list" id="list">
360368
<?php
361369
$types = Array(
370+
Array('2010', '2010级'),
362371
Array('2009', '2009级'),
363-
Array('2008','2008级'),
372+
Array('2008', '2008级'),
364373
Array('2007', '2007级'),
365374
Array('2006', '2006级'),
375+
Array('2005', '2005级'),
376+
Array('2004', '2004级'),
377+
Array('2003', '2003级'),
378+
Array('2002', '2002级'),
379+
Array('2001', '2001级'),
380+
Array('2000', '2000级'),
366381
Array('other', '更早...'),
367382
);
368383
if($show_events == true) {
@@ -415,7 +430,7 @@ function markerListMouseOut(marker_id) {
415430
您能在一张地图上看到分布在世界各地的海大人，并找到他们公开的联系方式。在这里，您能快速地通过搜索或者分类找到您当年的校友。为了方便其他校友也能找到您，热烈欢迎您提交自己的信息:</p>
416431
<p style="text-align:center;"><button type="button" class="btn btn-danger" data-toggle="modal" data-target="#modal_add" data-dismiss="modal">+ 加入</button><span> 或点击网页右侧面板相同按钮</span></p>
417432
<p>如果您在使用过程中遇到问题，或者对校友地图有任何意见与建议，欢迎向我们反馈：<a href="mailto:[email protected]">[email protected]</a></p><hr>
418-
<p>校友地图项目的诞生离不开<a href="http://www2.ouc.edu.cn/oceanyouth/" target="_blank">中国海洋大学校团委</a>与<a href="http://222.195.158.146/nc/index.html" target="_blank">中国海洋大学网络与信息中心</a>的支持.<br>离不开众多<a href="./Credits.html" target="_blank">开源工具</a>.</p>
433+
<p>校友地图项目的诞生离不开<a href="http://srdp.ouc.edu.cn/" target="_blank">本科生研究发展计划(SRDP)</a>与<a href="http://web.ouc.edu.cn/tw/" target="_blank">中国海洋大学校团委</a>的支持.<br>离不开众多<a href="./Credits.html" target="_blank">开源工具</a>.</p>
419434
</div>
420435
<div class="modal-footer">
421436
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
@@ -443,10 +458,17 @@ function markerListMouseOut(marker_id) {
443458
<label class="col-sm-2 control-label" for="input01">入学年份</label>
444459
<div class="col-sm-4">
445460
<select name="type" id="add_type" class="col-sm-3 form-control">
446-
<option value="2009">2009年</option>
461+
<option value="2010">2010年</option>
462+
<option value="2009">2009年</option>
447463
<option value="2008">2008年</option>
448464
<option value="2007">2007年</option>
449465
<option value="2006">2006年</option>
466+
<option value="2005">2005年</option>
467+
<option value="2004">2004年</option>
468+
<option value="2003">2003年</option>
469+
<option value="2002">2002年</option>
470+
<option value="2001">2001年</option>
471+
<option value="2000">2000年</option>
450472
<option value="other">更早...</option>
451473
</select>
452474
</div>
@@ -460,7 +482,7 @@ function markerListMouseOut(marker_id) {
460482
<label class="col-sm-1 control-label" for="add_position">职务</label>
461483
<div class="col-sm-4">
462484
<input type="text" class="form-control" name="position" id="add_position">
463-
<p class="help-block"><b>选填</b>，我们不会将其公开</p>
485+
<p class="help-block"><b>选填，保密</b>，不会公开</p>
464486
</div>
465487
</div>
466488
<div class="form-group">
@@ -471,9 +493,9 @@ function markerListMouseOut(marker_id) {
471493
<label class="col-sm-2 control-label" for="add_phone_number">联系电话</label>
472494
<div class="col-sm-4">
473495
<input type="text" class="form-control" name="phone_number" id="add_phone_number">
474-
<p class="help-block"><b>选填</b>，我们不会将其公开</p>
496+
<p class="help-block"><b>选填，保密</b>，只做紧急联系用</p>
475497
</div>
476-
</div>
498+
</div>
477499
<div class="form-group">
478500
<label class="col-sm-3 control-label" for="add_student_work">曾参与社会工作</label>
479501
<div class="col-sm-9">
@@ -497,6 +519,18 @@ function markerListMouseOut(marker_id) {
497519
</p>
498520
</div>
499521
</div>
522+
<div class="form-group">
523+
<label class="col-sm-2 control-label" for="add_qq_number">QQ号码</label>
524+
<div class="col-sm-4">
525+
<input type="text" class="form-control" name="qq_number" id="add_qq_number">
526+
<p class="help-block"><b>选填</b>，默认会展示给校友</p>
527+
</div>
528+
<label class="col-sm-2 control-label" for="add_wechat_number">微信号</label>
529+
<div class="col-sm-4">
530+
<input type="text" class="form-control" name="wechat_number" id="add_wechat_number">
531+
<p class="help-block"><b>选填</b>，默认会展示给校友</p>
532+
</div>
533+
</div>
500534
<div class="form-group">
501535
<label class="col-sm-2 control-label" for="add_description">自我描述</label>
502536
<div class="col-sm-10">
@@ -537,6 +571,8 @@ function markerListMouseOut(marker_id) {
537571
position = $form.find( '#add_position' ).val(),
538572
student_work = $form.find( '#add_student_work' ).val(),
539573
phone_number = $form.find( '#add_phone_number' ).val(),
574+
qq_number = $form.find( '#add_qq_number' ).val(),
575+
wechat_number = $form.find( '#add_wechat_number' ).val(),
540576
email = $form.find( '#add_owner_email' ).val(),
541577
name = $form.find( '#add_title' ).val(),
542578
type = $form.find( '#add_type' ).val(),
@@ -546,7 +582,7 @@ function markerListMouseOut(marker_id) {
546582
url = $form.attr( 'action' );
547583

548584
// send data and get results
549-
$.post( url, { employer_name: employer_name, position: position, student_work: student_work, phone_number: phone_number, email: email, name: name, type: type, address: address, uri: uri, description: description },
585+
$.post( url, { employer_name: employer_name, position: position, student_work: student_work, phone_number: phone_number, qq_number: qq_number, wechat_number: wechat_number, email: email, name: name, type: type, address: address, uri: uri, description: description },
550586
function( data ) {
551587
var content = $( data ).find( '#content' );
552588

0 commit comments

Comments
 (0)