908009fdc44… — Fossil SCM

M src/my_page.c

+8 -4

		--- src/my_page.c
		+++ src/my_page.c
		@@ -80,16 +80,19 @@
80	80	{
81	81	int uid = g.userUid;
82	82	char * sql = mprintf( "SELECT login,cap,info FROM user WHERE uid=%d",
83	83	uid );
84	84	Stmt st;
	85	+ char const *uname;
	86	+ char const *ucap;
	87	+ char const *uinfo;
85	88	db_prepare( &st, sql );
86	89	free( sql );
87	90	db_step(&st);
88		- char const * uname = db_column_text( &st, 0 );
89		- char const * ucap = db_column_text( &st, 1 );
90		- char const * uinfo = db_column_text( &st, 2 );
	91	+ uname = db_column_text( &st, 0 );
	92	+ ucap = db_column_text( &st, 1 );
	93	+ uinfo = db_column_text( &st, 2 );
91	94
92	95	@ <h2>Welcome, %s(uname)!</h2>
93	96	@ Your user ID is: %d(uid)<br/>
94	97	@ Your Fossil permissions are: [%s(ucap)]
95	98	@ [TODO: explain these]<br/>
		@@ -125,16 +128,17 @@
125	128
126	129	/*
127	130	** WEBPAGE: /my
128	131	*/
129	132	void mypage_page(void){
	133	+ const char *name;
130	134	login_check_credentials();
131	135	if( !g.okRdWiki ){
132	136	login_needed();
133	137	}
134	138	style_header("Your Home");
135		- char const * name = P("name");
	139	+ name = P("name");
136	140	if( name )
137	141	{
138	142	if( 0 == strcmp(name,"tickets") )
139	143	{
140	144	@ TODO: Tickets page.
141	145

	--- src/my_page.c
	+++ src/my_page.c
	@@ -80,16 +80,19 @@
80	{
81	int uid = g.userUid;
82	char * sql = mprintf( "SELECT login,cap,info FROM user WHERE uid=%d",
83	uid );
84	Stmt st;



85	db_prepare( &st, sql );
86	free( sql );
87	db_step(&st);
88	char const * uname = db_column_text( &st, 0 );
89	char const * ucap = db_column_text( &st, 1 );
90	char const * uinfo = db_column_text( &st, 2 );
91
92	@ <h2>Welcome, %s(uname)!</h2>
93	@ Your user ID is: %d(uid)<br/>
94	@ Your Fossil permissions are: [%s(ucap)]
95	@ [TODO: explain these]<br/>
	@@ -125,16 +128,17 @@
125
126	/*
127	** WEBPAGE: /my
128	*/
129	void mypage_page(void){

130	login_check_credentials();
131	if( !g.okRdWiki ){
132	login_needed();
133	}
134	style_header("Your Home");
135	char const * name = P("name");
136	if( name )
137	{
138	if( 0 == strcmp(name,"tickets") )
139	{
140	@ TODO: Tickets page.
141

	--- src/my_page.c
	+++ src/my_page.c
	@@ -80,16 +80,19 @@
80	{
81	int uid = g.userUid;
82	char * sql = mprintf( "SELECT login,cap,info FROM user WHERE uid=%d",
83	uid );
84	Stmt st;
85	char const *uname;
86	char const *ucap;
87	char const *uinfo;
88	db_prepare( &st, sql );
89	free( sql );
90	db_step(&st);
91	uname = db_column_text( &st, 0 );
92	ucap = db_column_text( &st, 1 );
93	uinfo = db_column_text( &st, 2 );
94
95	@ <h2>Welcome, %s(uname)!</h2>
96	@ Your user ID is: %d(uid)<br/>
97	@ Your Fossil permissions are: [%s(ucap)]
98	@ [TODO: explain these]<br/>
	@@ -125,16 +128,17 @@
128
129	/*
130	** WEBPAGE: /my
131	*/
132	void mypage_page(void){
133	const char *name;
134	login_check_credentials();
135	if( !g.okRdWiki ){
136	login_needed();
137	}
138	style_header("Your Home");
139	name = P("name");
140	if( name )
141	{
142	if( 0 == strcmp(name,"tickets") )
143	{
144	@ TODO: Tickets page.
145

M src/sync.c

+4 -6

		--- src/sync.c
		+++ src/sync.c
		@@ -37,21 +37,20 @@
37	37	#endif /* INTERFACE */
38	38
39	39	/*
40	40	** If the respository is configured for autosyncing, then do an
41	41	** autosync. This will be a pull if the argument is true or a push
42		-** if the argument is false. Return true if the autosync is done
43		-** and false if autosync is not requested for the current repository.
	42	+** if the argument is false.
44	43	*/
45		-int autosync(int flags){
	44	+void autosync(int flags){
46	45	const char *zUrl;
47	46	if( db_get_boolean("autosync", 0)==0 ){
48		- return 0;
	47	+ return;
49	48	}
50	49	zUrl = db_get("last-sync-url", 0);
51	50	if( zUrl==0 ){
52		- return 0; /* No default server */
	51	+ return; /* No default server */
53	52	}
54	53	url_parse(zUrl);
55	54	if( g.urlIsFile ){
56	55	return 0; /* Network sync only */
57	56	}
		@@ -60,11 +59,10 @@
60	59	}else{
61	60	printf("Autosync: http://%s%s\n", g.urlName, g.urlPath);
62	61	}
63	62	url_enable_proxy("via proxy: ");
64	63	client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0);
65		- return 1;
66	64	}
67	65
68	66	/*
69	67	** This routine processes the command-line argument for push, pull,
70	68	** and sync. If a command-line argument is given, that is the URL
71	69

	--- src/sync.c
	+++ src/sync.c
	@@ -37,21 +37,20 @@
37	#endif /* INTERFACE */
38
39	/*
40	** If the respository is configured for autosyncing, then do an
41	** autosync. This will be a pull if the argument is true or a push
42	** if the argument is false. Return true if the autosync is done
43	** and false if autosync is not requested for the current repository.
44	*/
45	int autosync(int flags){
46	const char *zUrl;
47	if( db_get_boolean("autosync", 0)==0 ){
48	return 0;
49	}
50	zUrl = db_get("last-sync-url", 0);
51	if( zUrl==0 ){
52	return 0; /* No default server */
53	}
54	url_parse(zUrl);
55	if( g.urlIsFile ){
56	return 0; /* Network sync only */
57	}
	@@ -60,11 +59,10 @@
60	}else{
61	printf("Autosync: http://%s%s\n", g.urlName, g.urlPath);
62	}
63	url_enable_proxy("via proxy: ");
64	client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0);
65	return 1;
66	}
67
68	/*
69	** This routine processes the command-line argument for push, pull,
70	** and sync. If a command-line argument is given, that is the URL
71

	--- src/sync.c
	+++ src/sync.c
	@@ -37,21 +37,20 @@
37	#endif /* INTERFACE */
38
39	/*
40	** If the respository is configured for autosyncing, then do an
41	** autosync. This will be a pull if the argument is true or a push
42	** if the argument is false.

43	*/
44	void autosync(int flags){
45	const char *zUrl;
46	if( db_get_boolean("autosync", 0)==0 ){
47	return;
48	}
49	zUrl = db_get("last-sync-url", 0);
50	if( zUrl==0 ){
51	return; /* No default server */
52	}
53	url_parse(zUrl);
54	if( g.urlIsFile ){
55	return 0; /* Network sync only */
56	}
	@@ -60,11 +59,10 @@
59	}else{
60	printf("Autosync: http://%s%s\n", g.urlName, g.urlPath);
61	}
62	url_enable_proxy("via proxy: ");
63	client_sync((flags & AUTOSYNC_PUSH)!=0, 1, 0);

64	}
65
66	/*
67	** This routine processes the command-line argument for push, pull,
68	** and sync. If a command-line argument is given, that is the URL
69

M src/tagview.c

+1 -1

		--- src/tagview.c
		+++ src/tagview.c
		@@ -139,19 +139,19 @@
139	139
140	140	/*
141	141	** WEBPAGE: /tagview
142	142	*/
143	143	void tagview_page(void){
	144	+ char const * check = 0;
144	145	login_check_credentials();
145	146	if( !g.okRdWiki ){
146	147	login_needed();
147	148	}
148	149	style_header("Tags");
149	150	login_anonymous_available();
150	151	tagview_page_search_miniform();
151	152	@ <hr/>
152		- char const * check = 0;
153	153	if( 0 != (check = P("tagid")) ){
154	154	tagview_page_tag_by_id( atoi(check) );
155	155	}else if( 0 != (check = P("like")) ){
156	156	tagview_page_list_tags( check );
157	157	}else if( 0 != (check = P("name")) ){
158	158

	--- src/tagview.c
	+++ src/tagview.c
	@@ -139,19 +139,19 @@
139
140	/*
141	** WEBPAGE: /tagview
142	*/
143	void tagview_page(void){

144	login_check_credentials();
145	if( !g.okRdWiki ){
146	login_needed();
147	}
148	style_header("Tags");
149	login_anonymous_available();
150	tagview_page_search_miniform();
151	@ <hr/>
152	char const * check = 0;
153	if( 0 != (check = P("tagid")) ){
154	tagview_page_tag_by_id( atoi(check) );
155	}else if( 0 != (check = P("like")) ){
156	tagview_page_list_tags( check );
157	}else if( 0 != (check = P("name")) ){
158

	--- src/tagview.c
	+++ src/tagview.c
	@@ -139,19 +139,19 @@
139
140	/*
141	** WEBPAGE: /tagview
142	*/
143	void tagview_page(void){
144	char const * check = 0;
145	login_check_credentials();
146	if( !g.okRdWiki ){
147	login_needed();
148	}
149	style_header("Tags");
150	login_anonymous_available();
151	tagview_page_search_miniform();
152	@ <hr/>

153	if( 0 != (check = P("tagid")) ){
154	tagview_page_tag_by_id( atoi(check) );
155	}else if( 0 != (check = P("like")) ){
156	tagview_page_list_tags( check );
157	}else if( 0 != (check = P("name")) ){
158

Fossil SCM