Changeset 1604

branches/multiuser/admin/channels.php

r1595	r1604
37	37
38	38	function channels() {
39		echo "<h2>". ~~LBL_ADMIN_CHANNELS~~ ."</h2>\n";
	39	echo "<h2>". __('Feeds:') ."</h2>\n";
40	40	echo "<div id=\"admin_channels\">\n";
41	41	echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n";
42	42	echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\" />\n";
43		echo "<label for=\"new_channel\">". ~~LBL_ADMIN_CHANNELS_ADD~~ ."</label>\n";
	43	echo "<label for=\"new_channel\">". __('Add a feed:') ."</label>\n";
44	44	echo "<input type=\"text\" name=\"new_channel\" id=\"new_channel\" value=\"http://\" onmouseover=\"clearOnHover(this);\" onfocus=\"this.select()\" />\n";
45	45
46		echo "<label for=\"add_channel_to_folder\">". ~~LBL_ADMIN_IN_FOLDER~~ . "</label>\n";
	46	echo "<label for=\"add_channel_to_folder\">". __('to folder:') . "</label>\n";
47	47	echo rss_toolkit_folders_combo('add_channel_to_folder');
48		echo "<label for=\"channel_tags\">" . ~~LBL_TAG_FOLDERS~~ . ":</label>\n";
	48	echo "<label for=\"channel_tags\">" . __('Categories') . ":</label>\n";
49	49	echo "<input type=\"text\" name=\"channel_tags\" id=\"channel_tags\" />\n";
50		echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"~~LBL~~_ADMIN_ADD\" />\n";
51		echo "<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_ADD~~ ."\" /></p>\n";
52		echo "<p style=\"font-size:small\">".~~LBL_ADMIN_ADD_CHANNEL_EXPL~~."</p>";
	50	echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_ADD\" />\n";
	51	echo "<input type=\"submit\" name=\"action\" value=\"". __('Add') ."\" /></p>\n";
	52	echo "<p style=\"font-size:small\">".__('(Enter either the URL of an RSS feed or of a Website whose feed you wish to subscribe to)')."</p>";
53	53	echo "</form>\n\n";
54	54
…	…
60	60	."('$b_url'.concat(escape(document.location).replace(/\s/,'%2520'))))";
61	61
62		echo "<p style=\"font-size:small\">" . ~~LBL_ADMIN_BOOKMARKET_LABEL . " <a class=\"bookmarklet\" href=\"$bookmarklet\">".LBL_ADMIN_BOOKMARKLET_TITLE~~."</a></p>\n";
	62	echo "<p style=\"font-size:small\">" . __('Subscription bookmarklet [<a href="http://www.squarefree.com/bookmarklets/">?</a>]:') . " <a class=\"bookmarklet\" href=\"$bookmarklet\">".__('Subscribe in Gregarius!')."</a></p>\n";
63	63
64	64	// feeds
…	…
83	83	."<tr>\n"
84	84	."\t<th><input type=\"checkbox\" id=\"mastercb\" onclick=\"cbtoggle();\" /></th>\n"
85		."\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_TITLE~~ ."</th>\n"
86		."\t<th class=\"cntr\">". ~~LBL_ADMIN_CHANNELS_HEADING_FOLDER~~ ."</th>\n"
87		."\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_DESCR~~ ."</th>\n"
88		."\t<th>". ~~LBL_TAG_FOLDERS~~."</th>\n"
89		."\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_FLAGS~~."</th>\n";
	85	."\t<th>". __('Title') ."</th>\n"
	86	."\t<th class=\"cntr\">". __('Folder') ."</th>\n"
	87	."\t<th>". __('Description') ."</th>\n"
	88	."\t<th>". __('Categories')."</th>\n"
	89	."\t<th>". __('Flags')."</th>\n";
90	90
91	91	if (getConfig('rss.config.absoluteordering')) {
92		echo "\t<th>".~~LBL_ADMIN_CHANNELS_HEADING_MOVE~~."</th>\n";
93		}
94
95		echo "\t<th class=\"cntr\">". ~~LBL_ADMIN_CHANNELS_HEADING_ACTION~~ ."</th>\n"
	92	echo "\t<th>".__('Move')."</th>\n";
	93	}
	94
	95	echo "\t<th class=\"cntr\">". __('Action') ."</th>\n"
96	96	."</tr>\n";
97	97
…	…
118	118	}
119	119
120		$parentLabel = $parent == ''? ~~LBL_HOME_FOLDER~~:$parent;
	120	$parentLabel = $parent == ''? __('Root'):$parent;
121	121
122	122	$class_ = (($cntr++ % 2 == 0)?"even":"odd");
…	…
171	171	if (getConfig('rss.config.absoluteordering')) {
172	172	echo "\t<td class=\"cntr\"><a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL
173		."&action=". CST_ADMIN_MOVE_UP_ACTION. "&cid=$id\">". ~~LBL_ADMIN_MOVE_UP~~
	173	."&action=". CST_ADMIN_MOVE_UP_ACTION. "&cid=$id\">". __('↑')
174	174	."</a> - <a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL
175		."&action=". CST_ADMIN_MOVE_DOWN_ACTION ."&cid=$id\">".~~LBL_ADMIN_MOVE_DOWN~~ ."</a></td>\n";
	175	."&action=". CST_ADMIN_MOVE_DOWN_ACTION ."&cid=$id\">".__('↓') ."</a></td>\n";
176	176	}
177	177	echo "\t<td class=\"cntr\"><a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL
178	178	."&".CST_ADMIN_VIEW."=". CST_ADMIN_DOMAIN_CHANNEL
179		."&action=". CST_ADMIN_EDIT_ACTION. "&cid=$id\">" . ~~LBL_ADMIN_EDIT~~
	179	."&action=". CST_ADMIN_EDIT_ACTION. "&cid=$id\">" . __('edit')
180	180	."</a>\|<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_CHANNEL
181	181	."&".CST_ADMIN_VIEW."=". CST_ADMIN_DOMAIN_CHANNEL
182		."&action=". CST_ADMIN_DELETE_ACTION ."&cid=$id\">" . ~~LBL_ADMIN_DELETE~~ ."</a></td>\n"
	182	."&action=". CST_ADMIN_DELETE_ACTION ."&cid=$id\">" . __('delete') ."</a></td>\n"
183	183	."</tr>\n";
184	184	}
…	…
189	189	."<legend>Selected...</legend>\n"
190	190	."<p>\n"
191		."<label for=\"me_folder\">".~~LBL_ADMIN_CHANNEL_FOLDER~~."</label>\n"
	191	."<label for=\"me_folder\">".__('In folder:')."</label>\n"
192	192	.rss_toolkit_folders_combo('me_folder',null);
193	193
194	194	echo
195		"<input type=\"submit\" id=\"me_move_to_folder\" name=\"me_move_to_folder\" value=\"".~~LBL_ADMIN_CHANNELS_HEADING_MOVE~~."\" />\n"
	195	"<input type=\"submit\" id=\"me_move_to_folder\" name=\"me_move_to_folder\" value=\"".__('Move')."\" />\n"
196	196
197	197	."<span class=\"vr\"> </span>"
198	198
199		."<label>".~~LBL_ADMIN_STATE~~."</label>\n"
	199	."<label>".__('State:')."</label>\n"
200	200	."<input type=\"checkbox\" name=\"me_deprecated\" id=\"me_deprecated\" value=\"".RSS_MODE_DELETED_STATE."\" />\n"
201		."<label for=\"me_deprecated\">".~~LBL_DEPRECATED~~."</label>\n"
	201	."<label for=\"me_deprecated\">".__('Deprecated')."</label>\n"
202	202
203	203	."<input type=\"checkbox\" name=\"me_private\" id=\"me_private\" value=\"".RSS_MODE_PRIVATE_STATE."\" />\n"
204		."<label for=\"me_private\">".~~LBL_PRIVATE~~."</label>\n"
205
206		."<input type=\"submit\" id=\"me_state\" name=\"me_state\" value=\"".~~LBL_ADMIN_STATE_SET~~."\" />\n"
	204	."<label for=\"me_private\">".__('Private')."</label>\n"
	205
	206	."<input type=\"submit\" id=\"me_state\" name=\"me_state\" value=\"".__('Set')."\" />\n"
207	207
208	208	."<span class=\"vr\"> </span>"
209	209
210		."<input type=\"submit\" id=\"me_delete\" name=\"me_delete\" value=\"".~~LBL_ADMIN_DELETE2~~."\" />\n"
	210	."<input type=\"submit\" id=\"me_delete\" name=\"me_delete\" value=\"".__('Delete')."\" />\n"
211	211	."<input type=\"checkbox\" name=\"me_do_delete\" id=\"me_do_delete\" value=\"1\" />\n"
212		."<label for=\"me_do_delete\">".~~LBL_ADMIN_IM_SURE~~."</label>\n"
	212	."<label for=\"me_do_delete\">".__("I'm sure!")."</label>\n"
213	213
214	214
…	…
249	249	switch ($__action__) {
250	250
251		case ~~LBL_ADMIN_ADD~~:
252		case '~~LBL~~_ADMIN_ADD':
	251	case __('Add'):
	252	case 'ACT_ADMIN_ADD':
253	253	case 'Add':
254	254
…	…
279	279	$newCid = $ret[0];
280	280	rss_error(sprintf(
281		~~LBL_ADMIN_OPML_IMPORT_FEED_INFO~~,
	281	__('Adding %s to %s... '),
282	282	htmlentities($label),"/$flabel")
283		. ~~LBL_ADMIN_OK~~
	283	. __('OK')
284	284	. " [<a href=\"".getPath()."admin/index.php?domain=".CST_ADMIN_DOMAIN_CHANNEL
285	285	."&action=edit&cid=$newCid\">"
286		. ~~LBL_ADMIN_EDIT~~
	286	. __('edit')
287	287	."</a>]",
288	288	RSS_ERROR_ERROR,true);
…	…
307	307	$newCid = $ret[0];
308	308	rss_error(sprintf(
309		~~LBL_ADMIN_OPML_IMPORT_FEED_INFO~~,
	309	__('Adding %s to %s... '),
310	310	htmlentities($label),"/$flabel")
311		. ~~LBL_ADMIN_OK~~
	311	. __('OK')
312	312	. " [<a href=\"".getPath()."admin/index.php?domain="
313	313	.CST_ADMIN_DOMAIN_CHANNEL
314	314	."&action=edit&cid=$newCid\">"
315		. ~~LBL_ADMIN_EDIT~~
	315	. __('edit')
316	316	."</a>]",
317	317	RSS_ERROR_ERROR,true);
…	…
327	327	// multiple feeds in the channel
328	328	echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
329		."<p>".sprintf(~~LBL_ADMIN_FEEDS~~,$label,$label)."</p>\n";
	329	."<p>".sprintf(__('The following feeds were found in <a href="%s">%s</a>, which one would you like to subscribe?'),$label,$label)."</p>\n";
330	330	$cnt = 0;
331	331	while(list($id,$feedarr) = each($feeds)) {
…	…
366	366	echo "<p><input type=\"hidden\" name=\"add_channel_to_folder\" value=\"$fid\" />\n"
367	367	."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\" />\n"
368		."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"~~LBL~~_ADMIN_ADD\" />\n"
369		."<input type=\"submit\" class=\"indent\" name=\"action\" value=\"". ~~LBL_ADMIN_ADD~~ ."\" />\n"
	368	."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"ACT_ADMIN_ADD\" />\n"
	369	."<input type=\"submit\" class=\"indent\" name=\"action\" value=\"". __('Add') ."\" />\n"
370	370	."</p>\n</form>\n\n";
371	371	}
…	…
377	377	}
378	378	else {
379		rss_error(sprintf(~~LBL_ADMIN_BAD_RSS_URL~~,$label), RSS_ERROR_ERROR,true);
	379	rss_error(sprintf(__("I'm sorry, I don't think I can handle this URL: '%s'"),$label), RSS_ERROR_ERROR,true);
380	380	$ret__ = CST_ADMIN_DOMAIN_CHANNEL;
381	381	}
382	382	} else {
383		rss_error(sprintf(~~LBL_ADMIN_BAD_RSS_URL~~,$label), RSS_ERROR_ERROR,true);
	383	rss_error(sprintf(__("I'm sorry, I don't think I can handle this URL: '%s'"),$label), RSS_ERROR_ERROR,true);
384	384	$ret__ = CST_ADMIN_DOMAIN_CHANNEL;
385	385	}
…	…
394	394	case CST_ADMIN_DELETE_ACTION:
395	395	$id = sanitize($_REQUEST['cid'],RSS_SANITIZER_NUMERIC);
396		if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_YES~~) {
	396	if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == __('Yes')) {
397	397	$rs = rss_query("select distinct id from " .getTable("item") . " where cid=$id");
398	398	$ids = array();
…	…
419	419	$ret__ = CST_ADMIN_DOMAIN_CHANNEL;
420	420	}
421		elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_NO~~) {
	421	elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == __('No')) {
422	422	$ret__ = CST_ADMIN_DOMAIN_CHANNEL;
423	423	}
…	…
427	427	echo "<form class=\"box\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
428	428	."<p class=\"error\">";
429		printf(~~LBL_ADMIN_ARE_YOU_SURE~~,$cname);
	429	printf(__("Are you sure you wish to delete '%s'?"),$cname);
430	430	echo "</p>\n"
431		."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_NO~~ ."\" />\n"
432		."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_YES~~ ."\" />\n"
	431	."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('No') ."\" />\n"
	432	."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('Yes') ."\" />\n"
433	433	."<input type=\"hidden\" name=\"cid\" value=\"$id\" />\n"
434	434	."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\" />\n"
…	…
440	440
441	441
442		case ~~LBL_ADMIN_IMPORT~~:
443		case '~~LBL~~_ADMIN_IMPORT':
	442	case __('Import'):
	443	case 'ACT_ADMIN_IMPORT':
444	444
445	445
…	…
499	499
500	500	} else {
501		$prev_folder = ~~LBL_HOME_FOLDER~~;
	501	$prev_folder = __('Root');
502	502	$fid = 0;
503	503	}
…	…
531	531	if ($u__) {
532	532
533		echo "<li><p>" . sprintf(~~LBL_ADMIN_OPML_IMPORT_FEED_INFO~~,$t__,$f__);
	533	echo "<li><p>" . sprintf(__('Adding %s to %s... '),$t__,$f__);
534	534	flush();
535	535	list($retcde, $retmsg) = add_channel($u__, $fid, $t__, $d__);
…	…
543	543	}
544	544
545		echo "</ul>\n<p><b>".~~LBL_TITLE_UPDATING~~ ."...</b></p>\n";
	545	echo "</ul>\n<p><b>".__('Updating') ."...</b></p>\n";
546	546	echo "</div>\n";
547	547	flush();
…	…
615	615
616	616	if ($url == '' \|\| substr($url,0,4) != "http") {
617		rss_error(sprintf(~~LBL_ADMIN_BAD_RSS_URL~~,$url), RSS_ERROR_ERROR,true);
	617	rss_error(sprintf(__("I'm sorry, I don't think I can handle this URL: '%s'"),$url), RSS_ERROR_ERROR,true);
618	618	$ret__ = CST_ADMIN_DOMAIN_CHANNEL;
619	619	break;
…	…
741	741	break;
742	742
743
	743	case 'dump':
	744	// Make sure this is a POST
	745	if(!isset($_POST['dumpact'])) {
	746	die('Sorry, you can\'t access this via a GET');
	747	}
	748	$tbl = array('"','"');
	749	error_reporting(E_ALL);
	750	rss_require('schema.php');
	751	$tables=getExpectedTables();
	752	unset($tables['cache']);
	753	//$tables=array('channels','tag','config');
	754	$bfr='';
	755	$bfr .= '<'.'?xml version="1.0" encoding="UTF-8"?'.'>'."\n";
	756	$bfr .= '<dump prefix="'.getTable('').'" date="'.date('r').'">'."\n";
	757	foreach($tables as $table => $prefixed) {
	758	$rs = rss_query("select * from $prefixed");
	759	$bfr .="<$table>\n";
	760	while($row=rss_fetch_assoc($rs)) {
	761	$r="<row ";
	762	foreach($row as $key => $val) {
	763	$val=htmlspecialchars($val);
	764	$r.=" $key=\"$val\" ";
	765	}
	766	$r .= "/>\n";
	767	$bfr .=$r;
	768	}
	769	$bfr .="</$table>\n";
	770	}
	771	$bfr .='</dump>'."\n";
	772	$gzdata = gzencode($bfr, 9);
	773
	774
	775	// Delete the output buffer. This is probably a bad thing to do, if the ob'ing is turned off.
	776	// e.g. data was already sent to the brwoser.
	777	while (@ob_end_clean());
	778
	779	// Send the dump to the browser:
	780	header("Pragma: public"); // required
	781	header("Expires: 0");
	782	header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
	783	header("Connection: close");
	784	header("Content-Transfer-Encoding: binary");
	785	header("Content-Length: " . strlen($gzdata));
	786	header('Content-type: application/x-gzip');
	787	header('Content-disposition: inline; filename="gregarius.dump.'.date('MjSY').'.xml.gz"');
	788
	789	die($gzdata);
	790
	791	break;
744	792	default:
745	793	break;
…	…
764	812
765	813	echo "<div>\n";
766		echo "\n\n<h2>".~~LBL_ADMIN_CHANNEL_EDIT_CHANNEL~~." '$title'</h2>\n";
	814	echo "\n\n<h2>".__('Edit the feed ')." '$title'</h2>\n";
767	815
768	816	echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."#fa$cid\" id=\"channeledit\">\n";
…	…
770	818	// Timestamps
771	819	if(!empty($daterefreshed)) {
772		echo "<p><label>" . ~~LBL_ADDED~~ . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
773		."<p><label>" . ~~LBL_LAST_UPDATE~~ . ": ".date("M-d-Y H:i", strtotime($daterefreshed))."</label></p>\n";
	820	echo "<p><label>" . __('Added') . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
	821	."<p><label>" . __('Last Update') . ": ".date("M-d-Y H:i", strtotime($daterefreshed))."</label></p>\n";
774	822	} else {
775		echo "<p><label>" . ~~LBL_ADDED~~ . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
776		."<p><label>" . ~~LBL_LAST_UPDATE . ": " . LBL_FOOTER_LAST_MODIF_NEVER~~ . "</label></p>\n";
	823	echo "<p><label>" . __('Added') . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>"
	824	."<p><label>" . __('Last Update') . ": " . __('Never') . "</label></p>\n";
777	825	}
778	826	// Item name
779		echo "<p><label for=\"c_name\">". ~~LBL_ADMIN_CHANNEL_NAME~~ ."</label>\n"
	827	echo "<p><label for=\"c_name\">". __('Title:') ."</label>\n"
780	828	."<input type=\"text\" id=\"c_name\" name=\"c_name\" value=\"$title\" />"
781	829	."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CHANNEL."\" />\n"
…	…
786	834
787	835	// RSS URL
788		."<p><label for=\"c_url\">". ~~LBL_ADMIN_CHANNEL_RSS_URL~~ ."</label>\n"
789		."<a href=\"$url\">" . ~~LBL_VISIT~~ . "</a>\n"
	836	."<p><label for=\"c_url\">". __('RSS URL:') ."</label>\n"
	837	."<a href=\"$url\">" . __('(visit)') . "</a>\n"
790	838	."<input type=\"text\" id=\"c_url\" name=\"c_url\" value=\"$url\" /></p>"
791	839
792	840	// Site URL
793		."<p><label for=\"c_siteurl\">". ~~LBL_ADMIN_CHANNEL_SITE_URL~~ ."</label>\n"
794		."<a href=\"$siteurl\">" . ~~LBL_VISIT~~ . "</a>\n"
	841	."<p><label for=\"c_siteurl\">". __('Site URL:') ."</label>\n"
	842	."<a href=\"$siteurl\">" . __('(visit)') . "</a>\n"
795	843	."<input type=\"text\" id=\"c_siteurl\" name=\"c_siteurl\" value=\"$siteurl\" /></p>"
796	844
797	845	// Folder
798		."<p><label for=\"c_parent\">". ~~LBL_ADMIN_CHANNEL_FOLDER~~ ."</label>\n"
	846	."<p><label for=\"c_parent\">". __('In folder:') ."</label>\n"
799	847
800	848	.rss_toolkit_folders_combo('c_parent',$parent)
…	…
802	850
803	851	// Tags
804		echo "<p><label for=\"c_tags\">". ~~LBL_TAG_FOLDERS~~ . ":</label>\n"
	852	echo "<p><label for=\"c_tags\">". __('Categories') . ":</label>\n"
805	853	."<input type=\"text\" id=\"c_tags\" name=\"c_tags\" value=\"$tags\" /></p>";
806	854
…	…
826	874	."<input style=\"display:inline\" type=\"checkbox\" id=\"c_private\" "
827	875	." name=\"c_private\" value=\"1\"$pchk />\n"
828		."<label for=\"c_private\">". ~~LBL_ADMIN_CHANNEL_PRIVATE~~ ."</label>\n"
	876	."<label for=\"c_private\">". __('This feed is <strong>private</strong>, only admins see it.') ."</label>\n"
829	877	."<input type=\"hidden\" name=\"old_priv\" value=\"$old_priv\" />\n"
830	878	."</p>\n";
…	…
834	882	."<input style=\"display:inline\" type=\"checkbox\" id=\"c_deleted\" "
835	883	." name=\"c_deleted\" value=\"1\"$dchk />\n"
836		."<label for=\"c_deleted\">". ~~LBL_ADMIN_CHANNEL_DELETED~~ ."</label>\n"
	884	."<label for=\"c_deleted\">". __("This feed is <strong>deprecated</strong>, it won't be updated anymore and won't be visible in the feeds column.") ."</label>\n"
837	885	."<input type=\"hidden\" name=\"old_del\" value=\"$old_del\" />\n"
838	886	."</p>\n";
…	…
841	889	// Description
842	890	$descr = strip_tags($descr);
843		echo "<p><label for=\"c_descr\">". ~~LBL_ADMIN_CHANNEL_DESCR~~ ."</label>\n"
	891	echo "<p><label for=\"c_descr\">". __('Description:') ."</label>\n"
844	892	."<input type=\"text\" id=\"c_descr\" name=\"c_descr\" value=\"$descr\" /></p>\n";
845	893
846	894	// Icon
847	895	if (getConfig('rss.output.showfavicons')) {
848		echo "<p><label for=\"c_icon\">" . ~~LBL_ADMIN_CHANNEL_ICON~~ ."</label>\n";
	896	echo "<p><label for=\"c_icon\">" . __('Shown favicon:') ."</label>\n";
849	897
850	898	if (trim($icon) != "") {
…	…
853	901	}
854	902	echo "<img src=\"$icon\" alt=\"$title\" class=\"favicon\" width=\"16\" height=\"16\" />\n";
855		echo "<span>" . ~~LBL_CLEAR_FOR_NONE~~ ."</span>";
	903	echo "<span>" . __('(Leave blank for no icon)') ."</span>";
856	904	}
857	905
…	…
908	956
909	957
910		echo "<p style=\"clear:both; padding: 1em 0\"><input type=\"submit\" name=\"action_\" value=\"". ~~LBL_ADMIN_SUBMIT_CHANGES~~ ."\" /></p>";
	958	echo "<p style=\"clear:both; padding: 1em 0\"><input type=\"submit\" name=\"action_\" value=\"". __('Submit Changes') ."\" /></p>";
911	959
912	960	echo "</form></div>\n";

branches/multiuser/admin/config.php

r1388	r1604
29	29
30	30	function config() {
31		echo "<h2 class=\"trigger\">".~~LBL_ADMIN_CONFIG~~."</h2>\n"
	31	echo "<h2 class=\"trigger\">".__('Configuration:')."</h2>\n"
32	32	."<div id=\"admin_config\" class=\"trigger\">\n";
33	33
…	…
65	65	}
66	66	echo "<tr>\n"
67		."\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_KEY~~ ."</th>\n"
68		."\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_VALUE~~ ."</th>\n"
69		."\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_DESCR~~ ."</th>\n"
70		."\t<th class=\"cntr\">". ~~LBL_ADMIN_CHANNELS_HEADING_ACTION~~ ."</th>\n"
	67	."\t<th>". __('Key') ."</th>\n"
	68	."\t<th>". __('Value') ."</th>\n"
	69	."\t<th>". __('Description') ."</th>\n"
	70	."\t<th class=\"cntr\">". __('Action') ."</th>\n"
71	71	."</tr>\n";
72	72	}
…	…
106	106	case 'rss.output.lang':
107	107	$arr = getLanguages();
108		echo $arr[getConfig('rss.output.lang')];
	108	if (isset($arr[getConfig('rss.output.lang')]['language'])) {
	109	echo $arr[getConfig('rss.output.lang')]['language'];
	110	} else {
	111	echo getConfig('rss.output.lang');
	112	}
109	113	break;
110	114	case 'rss.config.tzoffset':
…	…
154	158	."&action=". CST_ADMIN_EDIT_ACTION. "&key=".$row['key_']
155	159	."&".CST_ADMIN_VIEW."=". $adminDomain
156		."$extraLinkText\">" . ~~LBL_ADMIN_EDIT~~
	160	."$extraLinkText\">" . __('edit')
157	161	."</a>";
158	162
…	…
161	165
162	166	."<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". $adminDomain
163		."&action=". CST_ADMIN_DEFAULT_ACTION. "&key=".$row['key_']."$extraLinkText\">" . ~~LBL_ADMIN_DEFAULT~~
	167	."&action=". CST_ADMIN_DEFAULT_ACTION. "&key=".$row['key_']."$extraLinkText\">" . __('default')
164	168	."</a>";
165	169	}
…	…
184	188	case 'CST_ADMIN_DEFAULT_ACTION':
185	189	if (!array_key_exists('key',$_REQUEST)) {
186		rss_error(~~'Invalid config key specified.'~~, RSS_ERROR_ERROR,true);
	190	rss_error(__('Invalid config key specified.'), RSS_ERROR_ERROR,true);
187	191	break;
188	192	}
…	…
194	198
195	199	if ($value == $default) {
196		rss_error(~~"The value for '$key' is the same as its default value!"~~, RSS_ERROR_ERROR,true);
197		break;
198		}
199
200		if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_YES~~) {
	200	rss_error(__("The value for '$key' is the same as its default value!"), RSS_ERROR_ERROR,true);
	201	break;
	202	}
	203
	204	if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == __('Yes')) {
201	205	rss_query("update " . getTable('config') ." set value_=default_ where key_='$key'" );
202	206	rss_invalidate_cache();
203	207	}
204		elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_NO~~) {
	208	elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == __('No')) {
205	209	//nop
206	210	}
…	…
228	232
229	233	echo "<p style=\"display:inline\">\n";
230		echo (isset($preview)?"<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_PREVIEW_CHANGES~~ ."\""
	234	echo (isset($preview)?"<input type=\"submit\" name=\"action\" value=\"". __('Preview') ."\""
231	235	.($onclickaction?" onclick=\"$onclickaction\"":"") ." />\n":"");
232		echo "<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"~~LBL~~_ADMIN_SUBMIT_CHANGES\" />";
233
234		echo "<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_SUBMIT_CHANGES~~ ."\""
	236	echo "<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\" />";
	237
	238	echo "<input type=\"submit\" name=\"action\" value=\"". __('Submit Changes') ."\""
235	239	.($onclickaction?" onclick=\"$onclickaction\"":"")
236	240	." /><input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CONFIG ."\"/>\n</p></form>\n";
…	…
239	243	echo "<form style=\"display:inline\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
240	244	."<p style=\"display:inline\">\n<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CONFIG ."\"/>\n"
241		."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"~~LBL~~_ADMIN_SUBMIT_CANCEL\" />"
242		."<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_CANCEL~~ ."\"/></p></form>\n"
	245	."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"ACT_ADMIN_SUBMIT_CANCEL\" />"
	246	."<input type=\"submit\" name=\"action\" value=\"". __('Cancel') ."\"/></p></form>\n"
243	247	."\n\n</div>\n";
244	248
…	…
246	250	break;
247	251
248		case ~~LBL_ADMIN_PREVIEW_CHANGES~~:
249		case '~~LBL~~_ADMIN_PREVIEW_CHANGES':
	252	case __('Preview'):
	253	case 'ACT_ADMIN_PREVIEW_CHANGES':
250	254	rss_error('fixme: preview not yet implemented', RSS_ERROR_ERROR,true);
251	255	break;
252	256
253		case ~~LBL_ADMIN_SUBMIT_CHANGES~~:
254		case '~~LBL~~_ADMIN_SUBMIT_CHANGES':
	257	case __('Submit Changes'):
	258	case 'ACT_ADMIN_SUBMIT_CHANGES':
255	259
256	260	$key = sanitize($_POST['key'],RSS_SANITIZER_NO_SPACES\|RSS_SANITIZER_SIMPLE_SQL);
…	…
298	302	case 'rss.output.lang':
299	303	$langs = getLanguages();
	304
300	305	$codes = array_keys($langs);
301	306	$out_val = implode(',',$codes);
…	…
319	324	case 'num':
320	325	if (!is_numeric($value)) {
321		rss_error(~~"Oops, I was expecting a numeric value, got '$value' instead!"~~, RSS_ERROR_ERROR,true);
	326	rss_error(__("Oops, I was expecting a numeric value, got '$value' instead!"), RSS_ERROR_ERROR,true);
322	327	break;
323	328	}
…	…
325	330	break;
326	331	case 'boolean':
327		if ($value != ~~LBL_ADMIN_TRUE && $value != LBL_ADMIN_FALSE~~) {
328		rss_error(~~'Oops, invalid value for ' . $key .": " . $value~~, RSS_ERROR_ERROR,true);
	332	if ($value != __('True') && $value != __('False')) {
	333	rss_error(__("Oops, invalid value for $key : $value"), RSS_ERROR_ERROR,true);
329	334	break;
330	335	}
331	336	$sql = "update " . getTable('config') . " set value_='"
332		.($value == ~~LBL_ADMIN_TRUE~~ ? 'true':'false') ."'"
	337	.($value == __('True') ? 'true':'false') ."'"
333	338	." where key_='$key'";
334	339	break;
…	…
338	343
339	344	if (strstr($oldvalue,$value) === FALSE) {
340		rss_error(~~"Oops, invalid value '$value' for this config key"~~, RSS_ERROR_ERROR,true);
	345	rss_error(__("Oops, invalid value '$value' for this config key"), RSS_ERROR_ERROR,true);
341	346	break;
342	347	}
…	…
357	362	." where key_='$key'";
358	363	} else {
359		rss_error(~~"Oops, invalid value '$value' for this config key"~~, RSS_ERROR_ERROR,true);
	364	rss_error(__("Oops, invalid value '$value' for this config key"), RSS_ERROR_ERROR,true);
360	365	}
361	366	break;
362	367	default:
363		rss_error(~~'Ooops, unknown config type: '~~ . $type, RSS_ERROR_ERROR,true);
	368	rss_error(__('Ooops, unknown config type: ') . $type, RSS_ERROR_ERROR,true);
364	369	//var_dump($_REQUEST);
365	370	break;
…	…
435	440
436	441
437		echo "<label for=\"c_value\">". ~~LBL_ADMIN_CONFIG_VALUE~~ ." $key:</label>\n"
	442	echo "<label for=\"c_value\">". __('Value for') ." $key:</label>\n"
438	443	."\t\t<select name=\"value\" id=\"c_value\">\n";
439	444	$cntr = 0;
440	445	$value = "";
441	446	$langs = getLanguages();
442		foreach ($langs as $code => $name) {
	447	foreach ($langs as $code => $info) {
	448	if (isset($info['language'])) {
	449	$l=$info['language'];
	450	} else {
	451	$l=$code;
	452	}
443	453	echo "<option value=\"$code\"";
444	454	if ($code == $active_lang) {
445	455	echo " selected=\"selected\"";
446	456	}
447		echo ">~~".$langs[$code]."~~</option>\n";
	457	echo ">$l</option>\n";
448	458	}
449	459	echo "</select>\n";
…	…
455	465	case 'string':
456	466	case 'num':
457		echo "<label for=\"c_value\">". ~~LBL_ADMIN_CONFIG_VALUE~~ ." $key:</label>\n"
	467	echo "<label for=\"c_value\">". __('Value for') ." $key:</label>\n"
458	468	."<input type=\"text\" id=\"c_value\" name=\"value\" value=\"$value\"/>";
459	469	break;
460	470	case 'boolean':
461		echo ~~LBL_ADMIN_CONFIG_VALUE~~ ." $key:</p><p>";
	471	echo __('Value for') ." $key:</p><p>";
462	472	echo "<input type=\"radio\" id=\"c_value_true\" name=\"value\""
463	473	.($value == 'true' ? " checked=\"checked\"":"") .""
464		." value=\"".~~LBL_ADMIN_TRUE~~."\" "
	474	." value=\"".__('True')."\" "
465	475	."/>\n"
466		."<label for=\"c_value_true\">" . ~~LBL_ADMIN_TRUE~~ . "</label>\n";
	476	."<label for=\"c_value_true\">" . __('True') . "</label>\n";
467	477
468	478	echo "<input type=\"radio\" id=\"c_value_false\" name=\"value\""
469	479	.($value != 'true' ? " checked=\"checked\"":"") .""
470		." value=\"".~~LBL_ADMIN_FALSE~~."\" "
	480	." value=\"".__('False')."\" "
471	481	."/>\n"
472		."<label for=\"c_value_false\">" . ~~LBL_ADMIN_FALSE~~ . "</label>\n";
	482	."<label for=\"c_value_false\">" . __('False') . "</label>\n";
473	483	break;
474	484	case 'enum':
475		echo "<label for=\"c_value\">". ~~LBL_ADMIN_CONFIG_VALUE~~ ." $key:</label>\n"
	485	echo "<label for=\"c_value\">". __('Value for') ." $key:</label>\n"
476	486	."\t\t<select name=\"value\" id=\"c_value\">\n";
477	487	$arr = explode(',',$value);
…	…
505	515
506	516	echo "<p class=\"error\">";
507		printf(~~LBL_ADMIN_ARE_YOU_SURE_DEFAULT~~,$key,$html_default);
	517	printf(__("Are you sure you wish to reset the value for %s to its default '%s'?"),$key,$html_default);
508	518	echo "</p>\n"
509		."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_NO~~ ."\"/>\n"
510		."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_YES~~ ."\"/>\n"
	519	."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('No') ."\"/>\n"
	520	."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('Yes') ."\"/>\n"
511	521	."<input type=\"hidden\" name=\"key\" value=\"$key\"/>\n"
512	522	."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".$adminDomain."\"/>\n"

branches/multiuser/admin/dashboard.php

r1345	r1604
40	40	}
41	41	}
42		define ('MAGPIE_FETCH_TIME_OUT',2);
	42	define ('MAGPIE_FETCH_TIME_OUT',2);
43	43	define ('MAGPIE_CACHE_AGE', $magpieCacheAge);
44	44	$rs = rss_query(

branches/multiuser/admin/folders.php

r1530	r1604
29	29
30	30	function folders() {
31		echo "<h2 class=\"trigger\">".~~LBL_ADMIN_FOLDERS~~."</h2>\n"
	31	echo "<h2 class=\"trigger\">".__('Folders:')."</h2>\n"
32	32	."<div id=\"admin_folders\" class=\"trigger\">\n";
33	33
…	…
36	36	echo "<p><input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_FOLDER."\"/>\n";
37	37
38		echo "<label for=\"new_folder\">".~~LBL_ADMIN_FOLDERS_ADD~~."</label>\n"
	38	echo "<label for=\"new_folder\">".__('Add a folder:')."</label>\n"
39	39	."<input type=\"text\" id=\"new_folder\" name=\"new_folder\" value=\"\" />"
40		."<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"~~LBL~~_ADMIN_ADD\"/>\n"
41		."<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_ADD~~ ."\"/>\n"
	40	."<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_ADD\"/>\n"
	41	."<input type=\"submit\" name=\"action\" value=\"". __('Add') ."\"/>\n"
42	42	."</p></form>\n\n";
43	43
44	44	echo "<table id=\"foldertable\">\n"
45	45	."<tr>\n"
46		."\t<th class=\"cntr\">". ~~LBL_ADMIN_CHANNELS_HEADING_TITLE~~ ."</th>\n";
	46	."\t<th class=\"cntr\">". __('Title') ."</th>\n";
47	47
48	48	if (getConfig('rss.config.absoluteordering')) {
49		echo "\t<th>".~~LBL_ADMIN_CHANNELS_HEADING_MOVE~~."</th>\n";
50		}
51
52		echo "\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_ACTION~~ ."</th>\n"
	49	echo "\t<th>".__('Move')."</th>\n";
	50	}
	51
	52	echo "\t<th>". __('Action') ."</th>\n"
53	53	."</tr>\n";
54	54
…	…
65	65	while (list($id, $name) = rss_fetch_row($res)) {
66	66
67		$name = $name == ''? ~~LBL_HOME_FOLDER~~:$name;
	67	$name = $name == ''? __('Root'):$name;
68	68
69	69	$class_ = (($cntr++ % 2 == 0)?"even":"odd");
…	…
78	78	if ($cntr > 2) {
79	79	echo "<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_FOLDER
80		."&action=". CST_ADMIN_MOVE_UP_ACTION. "&fid=$id\">". ~~LBL_ADMIN_MOVE_UP~~
	80	."&action=". CST_ADMIN_MOVE_UP_ACTION. "&fid=$id\">". __('↑')
81	81	."</a> - ";
82	82	}
83	83	echo "<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_FOLDER
84		."&action=". CST_ADMIN_MOVE_DOWN_ACTION ."&fid=$id\">".~~LBL_ADMIN_MOVE_DOWN~~ ."</a>";
	84	."&action=". CST_ADMIN_MOVE_DOWN_ACTION ."&fid=$id\">".__('↓') ."</a>";
85	85	} else {
86	86	echo " ";
…	…
90	90	}
91	91	echo "\t<td><a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_FOLDER
92		."&action=". CST_ADMIN_EDIT_ACTION. "&fid=$id\">" . ~~LBL_ADMIN_EDIT~~
	92	."&action=". CST_ADMIN_EDIT_ACTION. "&fid=$id\">" . __('edit')
93	93	."</a>";
94	94	if ($id > 0) {
95	95	echo "\|<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_FOLDER
96		."&action=". CST_ADMIN_DELETE_ACTION ."&fid=$id\">" . ~~LBL_ADMIN_DELETE~~ ."</a>";
	96	."&action=". CST_ADMIN_DELETE_ACTION ."&fid=$id\">" . __('delete') ."</a>";
97	97	}
98	98	echo "</td>\n"
…	…
121	121
122	122	// Item name
123		."<label for=\"f_name\">". ~~LBL_ADMIN_FOLDER_NAME~~ ."</label>\n"
	123	."<label for=\"f_name\">". __('Folder name:') ."</label>\n"
124	124	."<input type=\"text\" id=\"f_name\" name=\"f_name\" value=\"$name\"/></p>";
125	125
126		echo "<p><input type=\"submit\" name=\"action_\" value=\"". ~~LBL_ADMIN_SUBMIT_CHANGES~~ ."\"/></p>"
	126	echo "<p><input type=\"submit\" name=\"action_\" value=\"". __('Submit Changes') ."\"/></p>"
127	127	."</form></div>\n";
128	128
…	…
162	162
163	163	if ($fid == 0) {
164		rss_error(~~LBL_ADMIN_ERROR_CANT_DELETE_HOME_FOLDER~~, RSS_ERROR_ERROR,true);
	164	rss_error(__("You can't delete the Root folder"), RSS_ERROR_ERROR,true);
165	165	break;
166	166	}
167	167
168		if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_YES~~) {
	168	if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == __('Yes')) {
169	169	$sql = "delete from " . getTable("folders") ." where id=$fid";
170	170	rss_query($sql);
…	…
173	173	rss_invalidate_cache();
174	174	}
175		elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_NO~~) {
	175	elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == __('No')) {
176	176	// nop;
177	177	}
…	…
181	181	echo "<form class=\"box\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
182	182	."<p class=\"error\">";
183		printf(~~LBL_ADMIN_ARE_YOU_SURE~~,$fname);
	183	printf(__("Are you sure you wish to delete '%s'?"),$fname);
184	184	echo "</p>\n"
185		."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_NO~~ ."\"/>\n"
186		."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_YES~~ ."\"/>\n"
	185	."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('No') ."\"/>\n"
	186	."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('Yes') ."\"/>\n"
187	187	."<input type=\"hidden\" name=\"fid\" value=\"$fid\"/>\n"
188	188	."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_FOLDER."\"/>\n"
…	…
202	202	list($cnt) = rss_fetch_row($res);
203	203	if ($cnt > 0) {
204		rss_error(sprintf(~~LBL_ADMIN_CANT_RENAME~~,$new_label), RSS_ERROR_ERROR,true);
	204	rss_error(sprintf(__("You can't rename this item '%s' because such an item already exists."),$new_label), RSS_ERROR_ERROR,true);
205	205	break;
206	206	}
…	…
210	210	break;
211	211
212		case ~~LBL_ADMIN_ADD~~:
213		case '~~LBL~~_ADMIN_ADD':
	212	case __('Add'):
	213	case 'ACT_ADMIN_ADD':
214	214	$label=sanitize($_REQUEST['new_folder'],RSS_SANITIZER_URL);
215	215	$new_label = rss_real_escape_string($new_label);
…	…
279	279
280	280	if ($exists > 0 && $complainonerror) {
281		rss_error(sprintf(~~LBL_ADMIN_ERROR_CANT_CREATE~~, $label), RSS_ERROR_ERROR,true);
	281	rss_error(sprintf(__("Looks like you already have a folder called '%s'!"), $label), RSS_ERROR_ERROR,true);
282	282	return;
283	283	}

branches/multiuser/admin/index.php

r1533	r1604
43	43	require_once('themes.php');
44	44	require_once('tags.php');
45		~~require_once('users.php');~~
46	45	require_once('../cls/wrappers/toolkit.php');
47	46
…	…
91	90	}
92	91	set_admin_pass($admin_uname,$admin_pass);
93		~~} else if(!rss_user_check_user_level(RSS_USER_LEVEL_BASIC))~~{
94		rss_login_form();
95		exit();
	92	} else if(!rss_user_check_user_level(RSS_USER_LEVEL_BASIC)) {
	93	rss_login_form();
	94	exit();
96	95	}
97	96	}
…	…
142	141	break;
143	142	case CST_ADMIN_DOMAIN_USERS:
144		$show = users_admin();
145		break;
	143	$show = users_admin();
	144	break;
146	145	default:
147	146	break;
…	…
193	192	break;
194	193	case CST_ADMIN_DOMAIN_USERS:
195		users();
196		break;
	194	users();
	195	break;
197	196	default:
198	197	}
…	…
208	207
209	208	} else {
210		rss_error(sprintf(LBL_ADMIN_ERROR_NOT_AUTHORIZED,getPath()), RSS_ERROR_ERROR,true);
	209	rss_error(sprintf(__('<h1>Not Authorized!</h1>
	210	You are not authorized to access the administration interface.
	211	Please follow <a href="%s">this link</a> back to the main page.
	212	Have a nice day!'),getPath()), RSS_ERROR_ERROR,true);
211	213	}
212	214	echo "</div>\n";
…	…
225	227	foreach (array (
226	228	/* url/id -- internationalized label, defined in intl/* */
227		array (CST_ADMIN_DOMAIN_DASHBOARD, LBL_ADMIN_DASHBOARD),
228		array (CST_ADMIN_DOMAIN_CHANNEL, LBL_ADMIN_DOMAIN_CHANNEL_LBL),
229		array (CST_ADMIN_DOMAIN_ITEM, LBL_ADMIN_DOMAIN_ITEM_LBL),
230		array (CST_ADMIN_DOMAIN_CONFIG, LBL_ADMIN_DOMAIN_CONFIG_LBL),
231		array (CST_ADMIN_DOMAIN_PLUGINS, LBL_ADMIN_DOMAIN_PLUGINS_LBL),
232		array (CST_ADMIN_DOMAIN_THEMES, LBL_ADMIN_DOMAIN_THEMES_LBL),
233		array (CST_ADMIN_DOMAIN_FOLDER, LBL_ADMIN_DOMAIN_FOLDER_LBL),
234		array (CST_ADMIN_DOMAIN_OPML, LBL_ADMIN_DOMAIN_LBL_OPML_LBL),
235		array (CST_ADMIN_DOMAIN_TAGS, LBL_TAG_TAGS),
236		array (CST_ADMIN_DOMAIN_USERS, LBL_ADMIN_USERS)) as $item) {
	229	array (CST_ADMIN_DOMAIN_DASHBOARD, __('Dashboard')),
	230	array (CST_ADMIN_DOMAIN_CHANNEL, __('feeds')),
	231	array (CST_ADMIN_DOMAIN_ITEM, __('items')),
	232	array (CST_ADMIN_DOMAIN_CONFIG, __('config')),
	233	array (CST_ADMIN_DOMAIN_PLUGINS, __('plugins')),
	234	array (CST_ADMIN_DOMAIN_THEMES, __('themes')),
	235	array (CST_ADMIN_DOMAIN_FOLDER, __('folders')),
	236	array (CST_ADMIN_DOMAIN_OPML, __('opml')),
	237	array (CST_ADMIN_DOMAIN_TAGS, __('Tags'))) as $item) {
237	238
238	239	$link = "index.php?view=".$item[0];
…	…
241	242	echo "\t<li$cls><a href=\"".getPath()."admin/$link\">".ucfirst($lbl)."</a></li>\n";
242	243	}
243		echo "\t<li><a href=\"".getPath()."?logout\">".~~LBL_ADMIN_LOGOUT~~."</a></li>\n";
	244	echo "\t<li><a href=\"".getPath()."?logout\">".__('Logout')."</a></li>\n";
244	245	echo "</ul>\n";
245	246	}
…	…
264	265	$ret = array();
265	266	$activeIdx = "0";
	267	$ret['en_US']=array(
	268	'language'=>'English',
	269	'windows-locale'=>'english'
	270	);
266	271	while (false !== ($entry = $d->read())) {
267		if (
268		$entry != "CVS" &&
269		substr($entry,0,1) != "."
270		) {
271		$info = getLanguageInfo($entry);
272		if (count($info) && array_key_exists('language',$info)) {
273		$shortL= preg_replace('\|\.php.*$\|','',$entry);
274		$ret[$shortL] = $info['language'];
275		}
276		}
	272	if (preg_match('#^[a-z]{2}_[A-Z]{2}$#',$entry)) {
	273	$ret[$entry]=getLanguageInfo($entry);
	274	}
277	275	}
278	276	$d->close();
…	…
282	280
283	281
284		function getLanguageInfo($~~file~~) {
	282	function getLanguageInfo($dir) {
285	283	$info = array();
286		$path = "../intl/$~~file~~";
	284	$path = "../intl/$dir/langinfo.txt";
287	285	if (file_exists($path)) {
288	286	$f = @fopen($path,'r');
…	…
295	293	}
296	294
297		if ($contents && preg_match_all("/~~\/\/\/\s?~~([^:]+):(.*)/",$contents,$matches,PREG_SET_ORDER)) {
	295	if ($contents && preg_match_all("/([^:]+):(.*)/",$contents,$matches,PREG_SET_ORDER)) {
298	296	foreach($matches as $match) {
299	297	$key = trim(strtolower($match[1]));
300	298	$val = trim($match[2]);
301		~~if ($key == 'version') {~~
302		~~$val=preg_replace('/[^0-9\.]+/','',$val);~~
303		}
304
305	299	$info[$key] = $val;
306	300	}
…	…
350	344
351	345	function admin_title() {
352		$title = array(~~"Admin"~~);
	346	$title = array(__("Admin"));
353	347	if (array_key_exists(CST_ADMIN_VIEW,$_REQUEST)) {
354	348	$title[] = ucwords(

branches/multiuser/admin/items.php

r1595	r1604
34	34
35	35	echo ""
36		. "<h2 class=\"trigger\">". ~~LBL_ADMIN_ITEM~~ ."</h2>\n"
	36	. "<h2 class=\"trigger\">". __('Items:') ."</h2>\n"
37	37	. "<div id=\"admin_items\">\n"
38	38	. "<form method=\"get\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
39	39	. "<fieldset class=\"prune\">\n"
40		. "<legend>".~~LBL_ADMIN_PRUNING~~."</legend>\n"
	40	. "<legend>".__('Pruning')."</legend>\n"
41	41	. "<p><input type=\"hidden\" name=\"". CST_ADMIN_DOMAIN ."\" value=\"".CST_ADMIN_DOMAIN_ITEM."\"/>\n"
42		. "<label for=\"prune_older\">" . ~~LBL_ADMIN_PRUNE_OLDER~~ ."</label>\n"
	42	. "<label for=\"prune_older\">" . __('Delete items older than ') ."</label>\n"
43	43	. "<input type=\"text\" size=\"5\" name=\"prune_older\" id=\"prune_older\" value=\"\" />\n"
44	44	. "<select name=\"prune_period\" id=\"prune_period\">\n"
45		. "<option>" . ~~LBL_ADMIN_PRUNE_DAYS~~ . "</option>\n"
46		. "<option>" . ~~LBL_ADMIN_PRUNE_MONTHS~~ . "</option>\n"
47		. "<option>" . ~~LBL_ADMIN_PRUNE_YEARS~~ . "</option>\n"
	45	. "<option>" . __('days') . "</option>\n"
	46	. "<option>" . __('months') . "</option>\n"
	47	. "<option>" . __('years') . "</option>\n"
48	48	. "</select></p>\n"
49		. "<p>\n"
50		. rss_toolkit_channels_combo("prune_channel") . "\n"
	49	. "<p><label for=\"prune_channel\">".__('...from these feeds').":</label>\n"
	50	. rss_toolkit_channels_combo("prune_channel", ALL_CHANNELS_ID, 0, true) . "\n"
51	51	. "</p>\n"
52		. "<p><label for=\"prune_include_sticky\">".~~LBL_ADMIN_PRUNE_INCLUDE_STICKY~~."</label>\n"
	52	. "<p><label for=\"prune_include_sticky\">".__('Delete Sticky items too: ')."</label>\n"
53	53	. "<input type=\"checkbox\" id=\"prune_include_sticky\" name=\"prune_include_sticky\" value=\"1\"/></p>\n"
54		. "<p><label for=\"prune_exclude_tags\">".~~LBL_ADMIN_PRUNE_EXCLUDE_TAGS~~."</label>\n"
	54	. "<p><label for=\"prune_exclude_tags\">".__('Do not delete items tagged... ')."</label>\n"
55	55	. "<input type=\"text\" id=\"prune_exclude_tags\" name=\"prune_exclude_tags\" value=\"\"/></p>\n"
56		. "<p style=\"font-size:small; padding:0;margin:0\">".~~LBL_ADMIN_ALLTAGS_EXPL~~."</p>\n"
57		. "<p class=\"cntr\"><input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_DELETE2~~ ."\"/></p>\n"
	56	. "<p style=\"font-size:small; padding:0;margin:0\">".__('(Enter <strong>*</strong> to keep all tagged items)')."</p>\n"
	57	. "<p class=\"cntr\"><input type=\"submit\" name=\"action\" value=\"". __('Delete') ."\"/></p>\n"
58	58	. "</fieldset>\n"
59	59	. "</form>\n"
…	…
68	68	$ret__ = CST_ADMIN_DOMAIN_NONE;
69	69	switch ($_REQUEST['action']) {
70		case ~~LBL_ADMIN_DELETE2~~:
	70	case __('Delete'):
71	71	$req = rss_query('select count(*) as cnt from ' .getTable('item')
72	72	." where not(unread & " . RSS_MODE_DELETED_STATE .")"
…	…
79	79	is_numeric($_REQUEST['prune_older'])) {
80	80	switch ($_REQUEST['prune_period']) {
81		case ~~LBL_ADMIN_PRUNE_DAYS~~:
	81	case __('days'):
82	82	$period = 'day';
83	83	break;
84	84
85		case ~~LBL_ADMIN_PRUNE_MONTHS~~:
	85	case __('months'):
86	86	$period = 'month';
87	87	break;
88	88
89		case ~~LBL_ADMIN_PRUNE_YEARS~~:
	89	case __('years'):
90	90	$period = 'year';
91	91	break;
92	92
93	93	default:
94		rss_error(~~LBL_ADMIN_ERROR_PRUNING_PERIOD~~, RSS_ERROR_ERROR,true);
	94	rss_error(__('Invalid pruning period'), RSS_ERROR_ERROR,true);
95	95	return CST_ADMIN_DOMAIN_ITEM;
96	96	break;
…	…
227	227	. " and not(i.unread & " . RSS_MODE_DELETED_STATE .")"
228	228	));
229		rss_error(sprintf(~~LBL_ADMIN_ABOUT_TO_DELETE~~,$cnt_d,$cnt), RSS_ERROR_ERROR,true);
	229	rss_error(sprintf(__('Warning: you are about to delete %s items (of %s)'),$cnt_d,$cnt), RSS_ERROR_ERROR,true);
230	230
231	231	echo "<form action=\"\" method=\"post\">\n"
…	…
234	234	."<input type=\"hidden\" name=\"prune_period\" value=\"".$_REQUEST['prune_period']."\" />\n"
235	235	."<input type=\"hidden\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"1\" />\n"
236		."<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_DELETE2~~ ."\" />\n"
237		."<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_CANCEL~~ ."\"/>\n"
	236	."<input type=\"submit\" name=\"action\" value=\"". __('Delete') ."\" />\n"
	237	."<input type=\"submit\" name=\"action\" value=\"". __('Cancel') ."\"/>\n"
238	238	."</p>\n"
239	239	."</form>\n";
240	240	}
241	241	} else {
242		rss_error(~~LBL_ADMIN_ERROR_NO_PERIOD~~, RSS_ERROR_ERROR,true);
	242	rss_error(__('oops, no period specified'), RSS_ERROR_ERROR,true);
243	243	$ret__ = CST_ADMIN_DOMAIN_ITEM;
244	244	}

branches/multiuser/admin/opml.php

r1530	r1604
36	36	//disable file upload formfields when file_upload is false
37	37	$disableupload = ini_get('file_uploads') ? "":" disabled=\"disabled\" ";
38		echo "<h2>". ~~LBL_ADMIN_OPML~~ ."</h2>\n";
	38	echo "<h2>". __('OPML:') ."</h2>\n";
39	39	echo "<div id=\"admin_opml\">\n";
40	40
41	41	echo "<fieldset id=\"opmlimport\">\n"
42		."<legend>" . ~~LBL_ADMIN_OPML_IMPORT_OPML~~ . "</legend>";
	42	."<legend>" . __('Import OPML:') . "</legend>";
43	43
44	44	echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n";
45	45	echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_DOMAIN ."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\"/>\n";
46		echo "<label for=\"opml\">" . ~~LBL_ADMIN_OPML_IMPORT_FROM_URL~~ ."</label>\n";
	46	echo "<label for=\"opml\">" . __('... from URL:') ."</label>\n";
47	47	echo "<input type=\"text\" name=\"opml\" id=\"opml\" value=\"http://\" onfocus=\"this.select()\"/></p>\n";
48	48
…	…
50	50	echo '<p><input type="hidden" name="' . CST_ADMIN_DOMAIN . '" value="' . CST_ADMIN_DOMAIN_CHANNEL . "\" />\n";
51	51	echo '<input type="hidden" name="MAX_FILE_SIZE" value="150000" />' . "\n";
52		echo '<label for="opmlfile">' . ~~LBL_ADMIN_OPML_IMPORT_FROM_FILE~~ . "</label>\n";
	52	echo '<label for="opmlfile">' . __('... from File:') . "</label>\n";
53	53	echo '<input name="opmlfile" type="file" id="opmlfile" '.$disableupload.'/></p>' . "\n";
54	54
…	…
61	61
62	62	echo "\n"
63		."<p>".~~LBL_ADMIN_OPML_IMPORT_AND~~."</p>"
	63	."<p>".__('Import new feeds and:')."</p>"
64	64
65	65	."<p style=\"padding-left:1em;\"><input checked=\"checked\" type=\"radio\" id=\"opml_import_option_merge\" name=\"opml_import_option\" value=\"".CST_ADMIN_OPML_IMPORT_MERGE."\" />\n"
66		."<label for=\"opml_import_option_merge\" >".~~LBL_ADMIN_OPML_IMPORT_MERGE~~."</label></p>\n"
	66	."<label for=\"opml_import_option_merge\" >".__('... merge them with the existing ones.')."</label></p>\n"
67	67
68	68
69	69	."<p style=\"padding-left:1em;\"><input type=\"radio\" id=\"opml_import_option_folder\" name=\"opml_import_option\" value=\"".CST_ADMIN_OPML_IMPORT_FOLDER."\" />\n"
70		."<label for=\"opml_import_option_folder\" >".~~LBL_ADMIN_OPML_IMPORT_FOLDER~~."</label>"
	70	."<label for=\"opml_import_option_folder\" >".__('... add them to the folder:')."</label>"
71	71	.rss_toolkit_folders_combo('opml_import_to_folder',null)
72	72	."</p>\n"
73	73
74	74	."<p style=\"padding-left:1em;\"><input type=\"radio\" id=\"opml_import_option_wipe\" name=\"opml_import_option\" value=\"".CST_ADMIN_OPML_IMPORT_WIPE."\" />\n"
75		."<label for=\"opml_import_option_wipe\" >".~~LBL_ADMIN_OPML_IMPORT_WIPE~~."</label></p>\n"
	75	."<label for=\"opml_import_option_wipe\" >".__('... replace all existing feeds and items.')."</label></p>\n"
76	76
77	77	."";
78	78
79	79
80		echo "<p style=\"text-align:center\"><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"~~LBL~~_ADMIN_IMPORT\" />\n";
81		echo "<input type=\"submit\" name=\"action\" value=\"". ~~LBL_ADMIN_OPML_IMPORT~~ ."\" /></p>\n";
	80	echo "<p style=\"text-align:center\"><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_IMPORT\" />\n";
	81	echo "<input type=\"submit\" name=\"action\" value=\"". __('Import') ."\" /></p>\n";
82	82
83	83
…	…
91	91	// export
92	92	opml_export_form();
93
	93	dump_export_form();
94	94	echo "</div>\n";
95	95	}
…	…
105	105	$action = getPath() ."opml.php";
106	106	}
107		echo "<fieldset style=\"vertical-align:top\">\n<legend>".~~LBL_ADMIN_OPML_EXPORT_OPML~~."</legend>\n";
	107	echo "<fieldset style=\"vertical-align:top\">\n<legend>".__('Export OPML:')."</legend>\n";
108	108	echo "<form method=\"$method\" action=\"$action\">\n"
109		."<p><label for=\"action\">". LBL_ADMIN_OPML_EXPORT_OPML. "</label>\n"
110		."<input type=\"submit\" name=\"act\" id=\"action\" value=\"". LBL_ADMIN_EXPORT ."\" />"
	109	."<p><label for=\"action\">". __('Export OPML:'). "</label>\n"
	110	."<input type=\"submit\" name=\"act\" id=\"action\" value=\"". __('Export') ."\" />"
	111	."</p>\n</form>\n"
	112	."</fieldset>\n";
	113	}
	114
	115
	116	/*** DUMP ****/
	117
	118	function dump_export_form() {
	119
	120	echo "<fieldset style=\"vertical-align:top\">\n<legend>".__('XML Dump:')."</legend>\n";
	121	echo "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">\n"
	122	."<p><label for=\"action\">". __('Dump your Gregarius installation to XML'). "</label>\n"
	123	."<input type=\"submit\" name=\"dumpact\" id=\"action\" value=\"".__('Dump!')."\" />"
	124	."<input type=\"hidden\" name=\"". CST_ADMIN_DOMAIN ."\" value=\"".CST_ADMIN_DOMAIN_CHANNEL."\"/>\n"
	125	."<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"dump\"/>\n"
111	126	."</p>\n</form>\n"
112	127	."</fieldset>\n";

branches/multiuser/admin/plugins.php

r1438	r1604
84	84
85	85	// Rendering
86		echo "<h2 class=\"trigger\">".~~LBL_ADMIN_PLUGINS~~."</h2>\n"
	86	echo "<h2 class=\"trigger\">".__('Plugins')."</h2>\n"
87	87	."<div id=\"admin_plugins\">\n";
88	88
89	89
90		echo ~~LBL_ADMIN_PLUGINS_GET_MORE~~;
	90	echo __('<p style="font-size:small">Plugins are third-party scripts that offer extended functionalities. More plugins can be downloaded at the <a style="text-decoration:underline" href="http://plugins.gregarius.net/">Plugin Repository</a>.</p>');
91	91
92	92	echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n";
93	93	echo "<p><input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_PLUGINS."\" /></p>\n";
94	94	echo "\n<table id=\"plugintable\">\n<tr>\n"
95		."<th>".~~LBL_ADMIN_PLUGINS_HEADING_ACTION~~."</th>\n"
96		."<th>".~~LBL_ADMIN_PLUGINS_HEADING_NAME~~."</th>\n"
97		."<th>".~~LBL_ADMIN_PLUGINS_HEADING_VERSION~~."</th>\n"
98		."<th>".~~LBL_ADMIN_PLUGINS_HEADING_AUTHOR~~."</th>\n"
99		."<th>".~~LBL_ADMIN_PLUGINS_HEADING_DESCRIPTION~~."</th>\n"
100		."<th>".~~LBL_ADMIN_PLUGINS_HEADING_OPTIONS~~."</th>\n";
	95	."<th>".__('Active')."</th>\n"
	96	."<th>".__('Name')."</th>\n"
	97	."<th>".__('Version')."</th>\n"
	98	."<th>".__('Author')."</th>\n"
	99	."<th>".__('Description')."</th>\n"
	100	."<th>".__('Options')."</th>\n";
101	101	if ($doUpdates) {
102		echo "<th>".~~LBL_ADMIN_PLUGINS_HEADING_UPDATES~~."</th>\n";
	102	echo "<th>".__('Update Available')."</th>\n";
103	103	}
104	104
…	…
147	147	."&action=". CST_ADMIN_EDIT_ACTION. "&plugin_name=".$escaped_plugin_name
148	148	."&" .CST_ADMIN_VIEW ."=" .CST_ADMIN_DOMAIN_PLUGIN_OPTIONS
149		."\">" . ~~LBL_ADMIN_EDIT~~
	149	."\">" . __('edit')
150	150	."</a>";
151	151	} else {
…	…
167	167	}
168	168	echo "</table>\n";
169		echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"~~LBL~~_ADMIN_SUBMIT_CHANGES\"/>\n";
170		echo "<input type=\"submit\" name=\"admin_plugin_submit_changes\" value=\"".~~LBL_ADMIN_SUBMIT_CHANGES~~."\" />\n";
171		echo "<input type=\"submit\" name=\"admin_plugin_check_for_updates\" value=\"".~~LBL_ADMIN_CHECK_FOR_UPDATES~~."\" /></p></form>\n";
	169	echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION ."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\"/>\n";
	170	echo "<input type=\"submit\" name=\"admin_plugin_submit_changes\" value=\"".__('Submit Changes')."\" />\n";
	171	echo "<input type=\"submit\" name=\"admin_plugin_check_for_updates\" value=\"".__('Check for Updates')."\" /></p></form>\n";
172	172	echo "</div>";
173	173	}
…	…
200	200	if ($plugin_output) { // Let us set up a form
201	201	echo "<h2
202		class=\"trigger\">".~~LBL_ADMIN_PLUGINS_OPTIONS~~." ".TITLE_SEP." ". $plugin_info['name']. "</h2>\n"
	202	class=\"trigger\">".__('Plugin Options')." ".TITLE_SEP." ". $plugin_info['name']. "</h2>\n"
203	203	."<div id=\"admin_plugin_options\">\n";
204	204	echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n";
…	…
208	208	echo "<p><input type=\"hidden\" name=\"plugin_name\" value=\"".$plugin_filename."\"/>\n";
209	209	echo "<p><input type=\"hidden\" name=\"". CST_ADMIN_METAACTION
210		."\" value=\"~~LBL~~_ADMIN_SUBMIT_CHANGES\"/>\n";
	210	."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\"/>\n";
211	211	echo "<input type=\"submit\" name=\"admin_plugin_options_submit_changes\" value=\""
212		.~~LBL_ADMIN_SUBMIT_CHANGES~~."\" />\n";
	212	.__('Submit Changes')."\" />\n";
213	213	echo "<input type=\"submit\" name=\"admin_plugin_options_cancel_changes\"
214		value=\"".~~LBL_ADMIN_CANCEL~~."\" /></p></form>\n";
	214	value=\"".__('Cancel')."\" /></p></form>\n";
215	215	echo "</div>";
216	216	} else {

branches/multiuser/admin/tags.php

r1515	r1604
58	58
59	59	case CST_ADMIN_DELETE_ACTION:
60		if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_YES~~) {
	60	if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == __('Yes')) {
61	61	$sql = "delete from " . getTable("tag") ." where id=$tid";
62	62	rss_query($sql);
…	…
64	64	rss_query($sql);
65	65	rss_invalidate_cache();
66		} elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_NO~~) {
	66	} elseif (array_key_exists(CST_ADMIN_CONFIRMED,$_REQUEST) && $_REQUEST[CST_ADMIN_CONFIRMED] == __('No')) {
67	67	// nop;
68	68	} elseif (array_key_exists('me_delete', $_REQUEST)) {
…	…
91	91	echo "<form class=\"box\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
92	92	."<p class=\"error\">";
93		printf(~~LBL_ADMIN_ARE_YOU_SURE~~,$tname);
	93	printf(__("Are you sure you wish to delete '%s'?"),$tname);
94	94	echo "</p>\n"
95		."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_NO~~ ."\"/>\n"
96		."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". ~~LBL_ADMIN_YES~~ ."\"/>\n"
	95	."<p><input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('No') ."\"/>\n"
	96	."<input type=\"submit\" name=\"".CST_ADMIN_CONFIRMED."\" value=\"". __('Yes') ."\"/>\n"
97	97	."<input type=\"hidden\" name=\"id\" value=\"$tid\"/>\n"
98	98	."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_TAGS."\"/>\n"
…	…
111	111	list($cnt) = rss_fetch_row($res);
112	112	if ($cnt > 0) {
113		rss_error(sprintf(~~LBL_ADMIN_CANT_RENAME~~,$new_label), RSS_ERROR_ERROR,true);
	113	rss_error(sprintf(__("You can't rename this item '%s' because such an item already exists."),$new_label), RSS_ERROR_ERROR,true);
114	114	break;
115	115	}
…	…
133	133
134	134	echo "<form method=\"post\" action=\"" . $_SERVER['PHP_SELF'] . "\">\n"
135		."<h2 class=\"trigger\">".~~LBL_TAG_TAGS~~."</h2>\n"
	135	."<h2 class=\"trigger\">".__('Tags')."</h2>\n"
136	136	."<div id=\"admin_tags\" class=\"trigger\">"
137	137	."<table id=\"tagtable\">\n"
138	138	."<tr>\n"
139	139	."\t<th><input type=\"checkbox\" id=\"mastercb\" onclick=\"cbtoggle();\" /></th>\n"
140		."\t<th class=\"cntr\">". ~~LBL_TAG_TAGS~~ ."</th>\n"
141		."\t<th>". ~~LBL_ADMIN_CHANNELS_HEADING_ACTION~~ ."</th>\n"
	140	."\t<th class=\"cntr\">". __('Tags') ."</th>\n"
	141	."\t<th>". __('Action') ."</th>\n"
142	142	."</tr>\n";
143	143
…	…
151	151	."\t<td><label for=\"scb_$id\">$tag</label></td>\n"
152	152	."\t<td><a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_TAGS
153		."&action=". CST_ADMIN_EDIT_ACTION. "&id=$id\">" . ~~LBL_ADMIN_EDIT~~
	153	."&action=". CST_ADMIN_EDIT_ACTION. "&id=$id\">" . __('edit')
154	154	."</a>\n"
155	155	."\|<a href=\"".$_SERVER['PHP_SELF']. "?".CST_ADMIN_DOMAIN."=". CST_ADMIN_DOMAIN_TAGS
156		."&action=". CST_ADMIN_DELETE_ACTION ."&id=$id\">" . ~~LBL_ADMIN_DELETE~~ ."</a>\n"
	156	."&action=". CST_ADMIN_DELETE_ACTION ."&id=$id\">" . __('delete') ."</a>\n"
157	157	."</td>\n"
158	158	."</tr>\n";
…	…
160	160	echo "</table>\n";
161	161	echo "<fieldset>\n"
162		."<legend>~~Selected~~...</legend>\n"
	162	."<legend>".__('Selected')."...</legend>\n"
163	163	."<p>\n"
164		."<input type=\"submit\" id=\"me_delete\" name=\"me_delete\" value=\"".~~LBL_ADMIN_DELETE2~~."\" />\n"
	164	."<input type=\"submit\" id=\"me_delete\" name=\"me_delete\" value=\"".__('Delete')."\" />\n"
165	165	."<input type=\"checkbox\" name=\"me_do_delete\" id=\"me_do_delete\" value=\"1\" />\n"
166		."<label for=\"me_do_delete\">".~~LBL_ADMIN_IM_SURE~~."</label>\n"
	166	."<label for=\"me_do_delete\">".__("I'm sure!")."</label>\n"
167	167	."<input type=\"hidden\" name=\"action\" value=\"".CST_ADMIN_DELETE_ACTION."\" />\n"
168	168	."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_TAGS."\" />\n"
…	…
178	178
179	179	echo "<div>\n"
180		."<h2>~~Edit~~ '$tag'</h2>\n"
	180	."<h2>".ucfirst(__('edit'))." '$tag'</h2>\n"
181	181	."<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\" id=\"tagedit\">\n"
182	182
…	…
184	184	."<input type=\"hidden\" name=\"action\" value=\"".CST_ADMIN_SUBMIT_EDIT."\"/>\n"
185	185	."<input type=\"hidden\" name=\"id\" value=\"$tid\"/>\n"
186		."<label for=\"t_name\">". ~~LBL_ADMIN_RENAME~~ ."</label>\n"
	186	."<label for=\"t_name\">". __('Rename to...') ."</label>\n"
187	187	."<input type=\"text\" id=\"t_name\" name=\"t_name\" value=\"$tag\"/>\n"
188		."<input type=\"submit\" name=\"action_\" value=\"". ~~LBL_ADMIN_SUBMIT_CHANGES~~ ."\"/></div>"
	188	."<input type=\"submit\" name=\"action_\" value=\"". __('Submit Changes') ."\"/></div>"
189	189	."</form></div>\n";
190	190	}

branches/multiuser/admin/themes.php

r1530	r1604
48	48	echo "<form style=\"float:right\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n"
49	49	. "<p><input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"".CST_ADMIN_DOMAIN_THEMES."\" />\n"
50		."<input type=\"submit\" name=\"admin_themes_check_for_updates\" value=\"".~~LBL_ADMIN_CHECK_FOR_UPDATES~~."\" /></p>\n"
	50	."<input type=\"submit\" name=\"admin_themes_check_for_updates\" value=\"".__('Check for Updates')."\" /></p>\n"
51	51	. "</form>\n";
52	52	if (isset($_POST['admin_themes_check_for_updates'])) {
53		theme_getThemesUpdate(&$themes);
	53	theme_getThemesUpdate($themes);
54	54	}
55	55
56		echo "<h2 class=\"trigger\">".~~LBL_ADMIN_THEMES~~."</h2>\n"
	56	echo "<h2 class=\"trigger\">".__('Themes')."</h2>\n"
57	57	."<div id=\"admin_themes\" >\n";
58		echo ~~LBL_ADMIN_THEMES_GET_MORE~~;
	58	echo __('<p style="font-size:small">Themes are made of a set of template files which specify how your Gregarius installation looks.<br />More themes can be downloaded from the <a style="text-decoration:underline" href="http://themes.gregarius.net/">Themes Repository</a>.</p>');
59	59
60	60
…	…
88	88	echo "<div class=\"themeframe".($active?" active":""). ($updateAvailable?" hilite":"")."\"><span>";
89	89	if (!$active && $htmltheme) {
90		echo "<a href=\"$seturl\" class=\"bookmarklet\">".~~LBL_ADMIN_USE_THIS_THEME~~."</a>";
	90	echo "<a href=\"$seturl\" class=\"bookmarklet\">".__('Use this Theme')."</a>";
91	91	} elseif($active) {
92		echo "<p class=\"bookmarklet\">".~~LBL_ADMIN_ACTIVE_THEME~~."</p>";
	92	echo "<p class=\"bookmarklet\">".__('Active Theme')."</p>";
93	93	}
94	94	echo "<h4>$h4</h4>\n";
…	…
98	98	."&theme=".$entry
99	99	."&" .CST_ADMIN_VIEW ."=" .CST_ADMIN_DOMAIN_THEME_OPTIONS
100		."\">" . ~~LBL_ADMIN_CONFIGURE~~ . "</a>";
	100	."\">" . __('Configure') . "</a>";
101	101	echo "<h5>$h5</h5>\n"
102	102	."<p class=\"themescreenshot\">$screenshotURL</p>"
…	…
150	150	if ($theme_output) { // Let us set up a form
151	151	echo "<h2
152		class=\"trigger\">".~~LBL_ADMIN_THEME_OPTIONS~~." ".TITLE_SEP." ". $name. "</h2>\n"
	152	class=\"trigger\">".__('Theme Options')." ".TITLE_SEP." ". $name. "</h2>\n"
153	153	."<div id=\"admin_theme_options\">\n";
154	154	echo "<form method=\"post\" ";
…	…
162	162	echo "<p><input type=\"hidden\" name=\"theme\" value=\"".$theme."\"/>\n";
163	163	echo "<input type=\"hidden\" name=\"". CST_ADMIN_METAACTION
164		."\" value=\"~~LBL~~_ADMIN_SUBMIT_CHANGES\"/>\n";
	164	."\" value=\"ACT_ADMIN_SUBMIT_CHANGES\"/>\n";
165	165	if( isset( $_REQUEST['mediaparam'] ) ) //pass it along
166	166	{
…	…
171	171	{
172	172	echo "<input type=\"submit\" name=\"admin_theme_options_submit_changes\" value=\""
173		.~~LBL_ADMIN_SUBMIT_CHANGES~~."\" />\n";
	173	.__('Submit Changes')."\" />\n";
174	174	echo "<input type=\"submit\" name=\"admin_theme_options_cancel_changes\"
175		value=\"".~~LBL_ADMIN_CANCEL~~."\" />\n";
	175	value=\"".__('Cancel')."\" />\n";
176	176	}
177	177	echo "</p></form>\n";
…	…
273	273
274	274	if( isset( $_REQUEST['mediaparam'] ) && $media === sanitize($_REQUEST['mediaparam'], RSS_SANITIZER_CHARACTERS) ) {
275		if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == ~~LBL_ADMIN_YES~~) {
	275	if (array_key_exists(CST_ADMIN_CONFIRMED,$_POST) && $_POST[CST_ADMIN_CONFIRMED] == __('Yes')) {
276	276	if (!array_key_exists('key',$_REQUEST)) {
277	277	rss_error('Invalid config key specified.', RSS_ERROR_ERROR,true);
…	…
283	283	} else if( rss_theme_options_is_submit() ) {
284	284	switch ($action) {
285		case ~~LBL_ADMIN_SUBMIT_CHANGES~~:
286		case '~~LBL~~_ADMIN_SUBMIT_CHANGES':
	285	case __('Submit Changes'):
	286	case 'ACT_ADMIN_SUBMIT_CHANGES':
287	287	if (!array_key_exists('key',$_REQUEST)) {
288	288	rss_error('Invalid config key specified.', RSS_ERROR_ERROR,true);

branches/multiuser/admin/users.php

r1533	r1604
51	51	pass2=document.getElementById('password2').value;
52	52	if(pass !== pass2){
53		msg = '<?php echo ~~LBL_ADMIN_PASS_NO_MATCH~~ ?>';
	53	msg = '<?php echo __('Passwords do not match!') ?>';
54	54	document.getElementById('admin_match_result').innerHTML = msg;
55	55	document.getElementById('password').value = '';
…	…
67	67	echo "\n<div id=\"channel_admin\" class=\"frame\">";
68	68	echo "<h2></h2>\n"
69		. ~~LBL_ADMIN_MUST_SET_PASS~~;
	69	. __('<p>No Administrator has been specified yet!</p><p>Please provide an Administrator username and password now!</p>');
70	70
71	71	echo "<form action=\"".$_SERVER['PHP_SELF'] . "\" onsubmit=\"return on_submit_password_match();\" method=\"post\">\n"
72	72	."<fieldset style=\"width:400px;\">"
73		."<p><label style=\"display:block\" for=\"username\">".~~LBL_USERNAME~~.":</label>\n"
	73	."<p><label style=\"display:block\" for=\"username\">".__('Username').":</label>\n"
74	74	."<input type=\"text\" id=\"username\" name=\"username\" /></p>\n"
75		."<p><label style=\"display:block\" for=\"password\">".~~LBL_PASSWORD~~.":</label>\n"
	75	."<p><label style=\"display:block\" for=\"password\">".__('Password').":</label>\n"
76	76	."<input type=\"password\" id=\"password\" name=\"password\" /></p>\n"
77		."<p><label style=\"display:block\" for=\"password2\">".~~LBL_PASSWORD2~~.":</label>\n"
	77	."<p><label style=\"display:block\" for=\"password2\">".__('Password (again)').":</label>\n"
78	78	."<input type=\"password\" id=\"password2\" name=\"password2\" /></p>\n"
79		."<p><input type=\"submit\" value=\"".~~LBL_ADMIN_OK~~."\" /></p>\n"
	79	."<p><input type=\"submit\" value=\"".__('OK')."\" /></p>\n"
80	80	."<div style=\"display:inline;\" id=\"admin_match_result\"></div>\n"
81	81	."</fieldset>\n"
…	…
95	95	style=\"text-align:center\" action=\"".$_SERVER['PHP_SELF'] ."\" method=\"post\">\n"
96	96	."<fieldset>"
97		."<legend>" . ~~LBL_ADMIN_LOGIN~~ . "</legend>\n"
98		."<p><label style=\"display:block\" for=\"username\">".~~LBL_USERNAME~~.":</label>\n"
	97	."<legend>" . __('Please log in') . "</legend>\n"
	98	."<p><label style=\"display:block\" for=\"username\">".__('Username').":</label>\n"
99	99	."<input type=\"text\" id=\"username\" name=\"username\" value=\"$uname\" /></p>\n"
100		."<p><label style=\"display:block\" for=\"password\">".~~LBL_PASSWORD~~.":</label>\n"
	100	."<p><label style=\"display:block\" for=\"password\">".__('Password').":</label>\n"
101	101	."<input type=\"password\" id=\"password\" name=\"password\" value=\"$pass\" /></p>\n"
102	102	."<p id=\"admin_login_submit\"><input type=\"submit\" value=\"".LBL_LOG_IN."\" /></p>\n"
…	…
117	117	echo "<table>\n"
118	118	."<tr>\n"
119		."\t<th>" . ~~LBL_USERNAME~~ . "</th>\n"
	119	."\t<th>" . __('Username') . "</th>\n"
120	120	."\t<th></th>\n"
121	121	."\t<th></th>\n"

branches/multiuser/ajax.php

r1530	r1604
79	79
80	80	$readItems -> populate(" i2u.flgunread=0 and i.cid= $cid", "", 0, 2, ITEM_SORT_HINT_READ);
81		$readItems -> setTitle(~~LBL_H2_RECENT_ITEMS~~);
	81	$readItems -> setTitle(__('Recent items'));
82	82	$readItems -> setRenderOptions(IL_TITLE_NO_ESCAPE);
83	83	foreach ($readItems -> feeds[0] -> items as $item) {
…	…
192	192
193	193	var aspan=document.getElementById("ta" + id);
194		aspan.innerHTML = "<a href=\"#\" onclick=\"_et(" +id +"); return false;\"><?php echo ~~LBL_TAG_EDIT~~ ?></a>";
	194	aspan.innerHTML = "<a href=\"#\" onclick=\"_et(" +id +"); return false;\"><?php echo __('edit') ?></a>";
195	195	}
196	196
…	…
211	211	var actionSpan = document.getElementById("ta" + id);
212	212	var toggle = actionSpan.firstChild;
213		if (toggle.innerHTML == "<?php echo ~~LBL_TAG_SUBMIT~~ ?>") {
	213	if (toggle.innerHTML == "<?php echo __('submit') ?>") {
214	214	var fld = document.getElementById("tfield" + id);
215		toggle.innerHTML="<?php echo ~~LBL_TAG_SUBMITTING~~ ?>";
	215	toggle.innerHTML="<?php echo __('...') ?>";
216	216	submit_tag(id,fld.value);
217		} else if (toggle.innerHTML == "<?php echo ~~LBL_TAG_EDIT~~ ?>") {
	217	} else if (toggle.innerHTML == "<?php echo __('edit') ?>") {
218	218	var isIE=document.all?true:false;
219	219	// the tag container
…	…
222	222	//.replace(<?php echo ALLOWED_TAGS_REGEXP ?>gi,"");
223	223	// submit link
224		toggle.innerHTML="<?php echo ~~LBL_TAG_SUBMIT~~ ?>";
	224	toggle.innerHTML="<?php echo __('submit') ?>";
225	225	// cancel link
226	226	cancel = document.createElement("a");
227	227	cancel.style.margin="0 0 0 0.5em";
228		cancel.innerHTML = "<?php echo ~~LBL_TAG_CANCEL~~ ?>";
	228	cancel.innerHTML = "<?php echo __('cancel') ?>";
229	229	cancel.setAttribute("href","#");
230	230	if (isIE) {
…	…
515	515	+ (tmpState & <?php echo RSS_MODE_UNREAD_STATE ?> ?' checked="checked"':'')
516	516	+ ' />'
517		+ '<label for="sf' + id + 'u"><?php echo ~~LBL_STATE_UNREAD~~ ?></label></p>'
	517	+ '<label for="sf' + id + 'u"><?php echo __("Unread (Set this item\'s read/unread state)") ?></label></p>'
518	518	+ '<p><input type="checkbox" id="sf' + id + 's" value="1"'
519	519	+ (tmpState & <?php echo RSS_MODE_STICKY_STATE ?> ?' checked="checked"':'')
520	520	+ ' />'
521		+ '<label for="sf' + id + 's"><?php echo ~~LBL_STATE_STICKY~~ ?></label></p>'
	521	+ '<label for="sf' + id + 's"><?php echo __("Sticky (Won\'t be deleted when you prune items)") ?></label></p>'
522	522	+ '<p><input type="checkbox" id="sf' + id + 'p" value="1"'
523	523	+ (tmpState & <?php echo RSS_MODE_PRIVATE_STATE ?> ?' checked="checked"':'')
524	524	+ ' />'
525		+ '<label for="sf' + id + 'p"><?php echo ~~LBL_STATE_PRIVATE~~ ?></label></p>'
	525	+ '<label for="sf' + id + 'p"><?php echo __("Private (Only administrators can see private items)") ?></label></p>'
526	526	+ '<p><input type="checkbox" id="sf' + id + 'f" value="1"'
527	527	+ (tmpState & <?php echo RSS_MODE_FLAG_STATE ?> ?' checked="checked"':'')
528	528	+ ' />'
529		+ '<label for="sf' + id + 'f"><?php echo ~~LBL_STATE_FLAG~~ ?></label></p>'
	529	+ '<label for="sf' + id + 'f"><?php echo __("Flag (Flags an item for later reading)") ?></label></p>'
530	530	+ extraCode
531	531	+ '<p class="sbm">'
532		+ '<a id="ess'+id+'ok" href="#" onclick="'+onOk+'"><?php echo ~~LBL_ADMIN_OK~~ ?></a>'
533		+ '<a href="#" onclick="'+onCancel+'"><?php echo ~~LBL_ADMIN_CANCEL~~ ?></a></p>'
	532	+ '<a id="ess'+id+'ok" href="#" onclick="'+onOk+'"><?php echo __("OK") ?></a>'
	533	+ '<a href="#" onclick="'+onCancel+'"><?php echo __("Cancel") ?></a></p>'
534	534	+ '</form>';
535	535

branches/multiuser/api.php

r1275	r1604
66	66	$sql = "select "
67	67	." c.id, c.title, c.url, c.siteurl, f.name "
68		." from ".getTable("channels")." c, "
69		.~~getTable("folders")." f "." where~~ f.id = c.parent";
	68	." from ".getTable("channels")." c "
	69	. " inner join " . getTable("folders")." f on f.id = c.parent";
70	70
71	71	if (hidePrivate()) {
…	…
135	135	." c.descr as cdescr, c.url as curl, i.author as iauth, i.url as iurl, "
136	136	." unix_timestamp(ifnull(i.pubdate, i.added)) as idate ,i.id as iid"
137		." from ".getTable('item')." i, ".getTable('channels') ." c "
138		." where i.cid=c.id and i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
	137	." from ".getTable('item')." i "
	138	. " inner join ".getTable('channels') ." c "
	139	." on i.cid=c.id where i.unread & ". RSS_MODE_UNREAD_STATE ." and c.id=$cid";
139	140
140	141	if ($date) {

branches/multiuser/author.php

r1464	r1604
39	39	}
40	40
41		$t = ucfirst(~~LBL_ITEMS) . " " . LBL_BY~~ . " " . $ra;
	41	$t = ucfirst(__('items')) . " " . __(' by ') . " " . $ra;
42	42	$GLOBALS['rss']->header = new Header($t);
43	43	$GLOBALS['rss']->feedList = new FeedList(false);

branches/multiuser/cls/alltags.php

r1181	r1604
76	76	.getTable('metatag');
77	77	if($this -> type == 'channel'){
78		$sql .= " left join " . getTable('channels') . " c on (fid=c.id),"
79		.~~getTable('tag')." t "." where~~ tid=t.id "
80		. " ~~and~~ ttype = 'channel'";
	78	$sql .= " left join " . getTable('channels') . " c on (fid=c.id) "
	79	. " inner join " . getTable('tag')." t "." on tid=t.id "
	80	. " where ttype = 'channel'";
81	81	}else{
82		$sql .= " left join ".getTable('item')." i on (fid=i.id),"
83		.~~getTable('tag')." t "." where~~ tid=t.id "
84		." ~~and~~ ttype = 'item'";
	82	$sql .= " left join ".getTable('item')." i on (fid=i.id) "
	83	. " inner join " . getTable('tag')." t "." on tid=t.id "
	84	." where ttype = 'item'";
85	85	}
86	86
…	…
91	91	}
92	92
93		$sql .= "group by tid order by tag";
	93	$sql .= " group by tid order by tag";
94	94
95	95
…	…
163	163	$taglink = $this -> makeTagLink($tag);
164	164	$ret .= "\t<a href=\"$taglink\" title=\"$cnt "
165		. ($cnt > 1 \|\| $cnt == 0 ? ~~LBL_ITEMS : LBL_ITEM~~)."\" style=\"font-size: "
	165	. ($cnt > 1 \|\| $cnt == 0 ? __('items') : __('item'))."\" style=\"font-size: "
166	166	. (SMALLEST + ($cnt / $fontstep)).UNIT.";\">$tag</a> \n";
167	167	}

branches/multiuser/cls/categories.php

r1519	r1604
58	58	$this->loadCollapsedState();
59	59	$this -> populate();
60		$this -> columnTitle = ~~LBL_TAG_FOLDERS~~;
	60	$this -> columnTitle = __('Categories');
61	61	$GLOBALS['rss']-> feedList = $this;
62	62	}
…	…
85	85
86	86	function getStats() {
87		return sprintf(~~LBL_CATCNT_PF~~, $this -> taggedFeedCnt, $this -> tagCnt, 0);
	87	return sprintf(__('<strong>%d</strong> feeds in <strong>%d</strong> categories'), $this -> taggedFeedCnt, $this -> tagCnt, 0);
88	88	}
89	89
…	…
109	109	//get unread count per folder
110	110	$sql = "select m.tid, t.tag, count(*) as cnt "
111		." from "
112		.getTable('item') ." i, "
113		.getTable('channels') . " c, "
114		.getTable('metatag') ." m, "
115		.getTable('tag') . " t"
	111	." from ".getTable('item') ." i, "
	112	. " inner join " . getTable('channels') . " c on i.cid = c.id "
	113	. " inner join " . getTable('metatag') ." m on m.fid = c.id "
	114	. " inner join " . getTable('tag') . " t on t.id = m.tid"
116	115	." where i.unread & ". RSS_MODE_UNREAD_STATE
117	116	." and not(i.unread & ". RSS_MODE_DELETED_STATE .")";
…	…
119	118	$sql .=" and not(unread & " . RSS_MODE_PRIVATE_STATE .") ";
120	119	}
121		$sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") ";
122		$sql .= " and i.cid=c.id and c.id=m.fid and m.tid=t.id"
	120	$sql .= " and not(c.mode & " . RSS_MODE_DELETED_STATE .") "
123	121	." group by m.tid";
124	122	_pf('query');
…	…
142	140	$sql = "select "
143	141	." c.id, c.title, c.url, c.siteurl, t.tag, c.parent, c.icon, c.descr, c.mode, t.id "
144		." from "
145		.getTable('channels') ." c, "
146		.getTable('metatag') ." m, "
147		.getTable('tag') . " t "
148		." where m.fid = c.id and m.ttype = 'channel' "
149		." and m.tid = t.id ";
	142	." from ".getTable('channels') ." c, "
	143	. " inner join " . getTable('metatag') ." m on m.fid = c.id "
	144	. " inner join " . getTable('tag') . " t on t.id = m.tid"
	145	." where m.ttype = 'channel' ";
150	146
151	147

branches/multiuser/cls/channels.php

r1595	r1604
97	97
98	98	if ($unreadCount > 0) {
99		$this->rdLbl= sprintf(~~LBL_UNREAD_PF~~, "cid$id","",$unreadCount);
	99	$this->rdLbl= sprintf(__('<strong id="%s" style="%s">(%d unread)</strong>'), "cid$id","",$unreadCount);
100	100	$this->class_= "feed title unread";
101	101	} else {
…	…
151	151	var $activeId;
152	152	var $feedCount = 0;
153		var $columnTitle ~~= LBL_H2_CHANNELS~~;
	153	var $columnTitle;
154	154	var $stats;
155	155
156	156	function FeedList($activeId) {
157	157	_pf('FeedList() ctor');
	158	$this ->columnTitle= __('Feeds');
158	159	$this->activeId = $activeId;
159	160	$this->loadCollapsedState();
…	…
170	171	_pf(' ... totalCount');
171	172	$sql =
172		"select count(*) from ".getTable("item2user") . "i , "
173		. getTable('channels2user') . " c2u "
174		." ~~where i.fkcid=c2u.fkcid and~~ i.flgdeleted=0 "
	173	"select count(*) from ".getTable("item2user") . "i "
	174	. " inner join " . getTable('channels2user') . " c2u "
	175	." on i.fkcid=c2u.fkcid where i.flgdeleted=0 "
175	176	." and c2u.fkuid=" . rss_user_id()
176	177	." and i.fkuid=" . rss_user_id()
…	…
194	195	_pf(' ... done: feedsCount');
195	196
196		$this ->stats = sprintf(~~LBL_ITEMCOUNT_PF~~, $total, $unread, $channelcount);
	197	$this ->stats = sprintf(__('<strong>%d</strong> items (<strong id="fucnt">%d</strong> unread) in <strong>%d</strong> feeds'), $total, $unread, $channelcount);
197	198	_pf('done: getStats()');
198	199	return $this -> stats;
…	…
221	222	//get unread count per folder
222	223	$sql = "select f.id, f.name, count(*) as cnt "
223		." from "
224		.getTable('item2user') ." i2u, "
225		.getTable('channels2user') . " c2u, "
226		.getTable('folders') ." f "
	224	." from " . getTable('item2user') ." i2u "
	225	. " inner join " . getTable('channels2user') . " c2u on c2u.fkuid=" . rss_user_id()
	226	. " inner join " . getTable('folders') ." f on c2u.parent=f.id"
227	227	." where i2u.flgunread =1 "
228	228	." and i2u.flgdeleted=0 ";
…	…
230	230	$sql .=" and i2u.flgprivate =0 ";
231	231	}
232		~~$sql .= " and c2u.fkuid=" . rss_user_id();~~
233	232	$sql .= " and c2u.flgdeleted=0 ";
234		~~$sql .= " and c2u.parent=f.id "~~
235	233	." group by f.id";
236	234	_pf('query');
…	…
255	253	$sql = "select "
256	254	." c.id, c.title, c.url, c.siteurl, f.name, c2u.parent, c2u.icon, c.descr, c2u.flgdeleted,c2u.flgprivate "
257		." from "
258		.getTable("channels")." c, "
259		.getTable("channels2user")." c2u, "
260		.getTable("folders")." f "
261
262		." where "
263		." f.id = c.parent "
264		." and c2u.fkcid=c.id "
265		. " and c2u.fkuid=" . rss_user_id();
	255	." from ".getTable("channels")." c "
	256	. " inner join " . getTable("channels2user")." c2u on c2u.fkcid=c.id "
	257	. " inner join " . getTable("folders") . " f.id = c.parent "
	258
	259	." where c2u.fkuid=" . rss_user_id();
266	260	if (hidePrivate()) {
267	261	$sql .= " and c2u.flgprivate=0 ";

branches/multiuser/cls/header.php

r1181	r1604
60	60	is_array($cidfid) &&
61	61	($uc = getUnreadCount($cidfid['cid'], $cidfid['fid']))) {
62		$this->docTitle .= " ($uc ".~~LBL_UNREAD~~.")";
	62	$this->docTitle .= " ($uc ".__('unread').")";
63	63	}
64	64
…	…
95	95
96	96	$GLOBALS['rss'] -> sideMenu = new SideMenu();
97		$GLOBALS['rss'] -> sideMenu -> addMenu(~~LBL_H2_CHANNELS~~,'FeedList' , "_side('FeedList')");
98		$GLOBALS['rss'] -> sideMenu -> addMenu(~~LBL_TAG_FOLDERS~~, 'CatList', "_side('CatList')");
99		$GLOBALS['rss'] -> sideMenu -> addMenu(~~LBL_TAG_TAGS~~, 'TagList', "_side('TagList')");
	97	$GLOBALS['rss'] -> sideMenu -> addMenu(__('Feeds'),'FeedList' , "_side('FeedList')");
	98	$GLOBALS['rss'] -> sideMenu -> addMenu(__('Categories'), 'CatList', "_side('CatList')");
	99	$GLOBALS['rss'] -> sideMenu -> addMenu(__('Tags'), 'TagList', "_side('TagList')");
100	100	}
101	101

branches/multiuser/cls/items.php

r1541	r1604
296	296	." left join "
297	297	.getTable("item") ." i "
298		." on (i2u.fkiid = i.id) left join "
299		//." left join "
300		//. getTable("rating") ." r on (i.id = r.iid), "
301		.getTable('channels2user') ." c2u on (i.cid=c2u.fkcid) left join "
302		.getTable("channels")." c on (c2u.fkcid=c.id) left join "
303		.getTable("folders") ." f on (c2u.parent=f.id) ";
	298	." on (i2u.fkiid = i.id)"
	299	//." inner join " . getTable("rating") ." r on (i.id = r.iid), "
	300	. " inner join " . getTable('channels2user') ." c2u on (i.cid=c2u.fkcid)"
	301	. " inner join " . getTable("channels")." c on (c2u.fkcid=c.id)"
	302	. " inner join " . getTable("folders") ." f on (c2u.parent=f.id) ";
304	303
305	304
…	…
428	427	// fetch the tags for the items;
429	428	$sql = "select t.tag,m.fid,i.cid "
430		." from "
431		.getTable('tag')." t, "
432		.getTable('metatag')." m, "
433		.getTable('item')." i "
434		." where m.tid = t.id and i.id=m.fid and m.ttype = 'item' and m.fid in (".implode(",", $this -> iids).")";
	429	." from " . getTable('tag')." t "
	430	. " inner join " . getTable('metatag')." m on m.tid = t.id"
	431	. " inner join " . getTable('item')." i on i.id = m.fid"
	432	." where m.ttype = 'item' and m.fid in (".implode(",", $this -> iids).")";
435	433
436	434	$res = $GLOBALS['rss_db']->rss_query($sql);
…	…
502	500	var $_parent;
503	501	var $pages;
504		function ItemListNavigation($il) {
	502	function ItemListNavigation(&$il) {
505	503	$this -> _parent = $il;
506	504	$this -> pages = array();
…	…
552	550	. $this -> _sqlActualWhere;
553	551	list($this -> numItems) = rss_fetch_row(rss_query($sql));
554		$this -> navigation = new ItemListNavigation(& $this);
	552	$this -> navigation = new ItemListNavigation($this);
555	553	}
556	554	}

branches/multiuser/cls/l10n.php

r1479	r1604
28	28	rss_require('extlib/l10n/streams.php');
29	29	rss_require('extlib/l10n/gettext.php');
30
	30	define('RSS_LOCALE_COOKIE','rss_preferred_locale');
31	31	class RSSl10n {
32	32
33	33	var $l10n;
34	34	var $cache;
	35	var $locale;
	36	var $isolang;
35	37
36		function RSSl10n($locale) {
37		$path = GREGARIUS_HOME .'/intl/' . $locale . '/LC_MESSAGES/messages.mo';
	38	function RSSl10n() {
	39	$this -> locale = preg_replace('#[^a-zA-Z_]#','',$this -> __detectUserLang());
	40
	41	$ll=explode('_',$this -> locale);
	42	$this->isloang=$ll[0].'-'.strtoupper($ll[1]);
	43
	44	if (function_exists('version_compare') && version_compare("4.3.0",PHP_VERSION, "<=") && preg_match('#([a-z]{2})_([A-Z]{2})#',$this -> locale,$m)) {
	45	$locales=array(
	46	$m[0].'UTF-8',
	47	$m[0].'utf-8',
	48	$m[0],
	49	$m[1].'_'.strtoupper($m[1]),
	50	$m[1],
	51	$m[2]
	52	);
	53	setlocale(LC_ALL, $locales);
	54	} else {
	55	setlocale(LC_ALL, $this -> locale);
	56	}
	57
	58	$path = GREGARIUS_HOME .'/intl/' . $this -> locale . '/LC_MESSAGES/messages.mo';
38	59	$streamer = new FileReader($path);
39	60	$this -> l10n = new gettext_reader($streamer);
…	…
41	62	}
42	63
43		function translate($msg) {
44		if (isset($this -> cache[$msg])) {
45		return $this -> cache[$msg];
	64	function translate($msg, $cnt = null) {
	65	if (isset($this -> cache[$msg . $cnt])) {
	66	return $this -> cache[$msg . $cnt];
46	67	}
47		$ret = $this -> l10n -> translate($msg);
48		$this -> cache[$msg] = $ret;
	68	$ret = $this -> l10n -> translate($msg, $cnt);
	69	$this -> cache[$msg . $cnt] = $ret;
49	70	return $ret;
50
51	71	}
	72
	73	function getLocale() {
	74	return $this -> locale;
	75	}
	76	function getISOLang() {
	77	return $this ->isloang;
	78	}
	79	/**
	80	* Detect users preferred language. Losely based on http://grep.be/data/accept-to-gettext.inc
	81	*/
	82	function __detectUserLang() {
	83	if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_[A-Z]{2}$#',$_REQUEST['lang']) && file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang'])) {
	84	setcookie(RSS_LOCALE_COOKIE,$_REQUEST['lang'],time()+3600*6,getPath());
	85	return $_REQUEST['lang'];
	86	} elseif (isset($_COOKIE[RSS_LOCALE_COOKIE])) {
	87	return trim($_COOKIE[RSS_LOCALE_COOKIE]);
	88	} elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
	89	$alparts=@preg_split("/,/",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
	90	foreach($alparts as $part) {
	91	$part=trim($part);
	92	if(preg_match("/;/", $part)) {
	93	$lang=@preg_split("/;/",$part);
	94	$ll = $lang[0];
	95	} else {
	96	$ll = $part;
	97	}
	98
	99	if (preg_match('#^([a-z]{2})[\-_]?([a-z]{2})?$#i',$ll,$pm)) {
	100	$ret =null;
	101	if (isset($pm[2])){
	102	if (file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[2]))) {
	103	// xx-yy -> xx_YY
	104	$ret= $pm[1] ."_".strtoupper($pm[2]);
	105	} elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) {
	106	// xx-yy -> xx_XX
	107	$ret= $pm[1] ."_".strtoupper($pm[1]);
	108	}
	109	} elseif(file_exists(GREGARIUS_HOME .'intl/'.$pm[1] ."_".strtoupper($pm[1]))) {
	110	// xx -> xx_XX
	111	$ret= $pm[1] ."_".strtoupper($pm[1]);
	112	} elseif($pm[1] == 'en') {
	113	// ugly: a better way would be to look up all the available locales
	114	// and match against that list
	115	$ret='en_US';
	116	}
	117	if ($ret) {
	118	// remember the detected locale for a couple hours
	119	setcookie(RSS_LOCALE_COOKIE,$ret,time()+3600*6,getPath());
	120	return $ret;
	121	}
	122	}
	123
	124	}
	125	}
	126	// If everything fails, return the user selected language
	127	return getConfig('rss.output.lang');
	128	}
52	129	}
	130
53	131
54		function __($msg) {
55		return $GLOBALS['rssl10n'] -> translate($msg);
	132
	133	function __($msg, $cnt = null) {
	134	return $GLOBALS['rssl10n'] -> translate($msg, $cnt);
56	135	}
57	136	?>

branches/multiuser/cls/nav.php

r1347	r1604
60	60	function Navigation() {
61	61
62		$this->appendNavItem(getPath(),LBL_NAV_HOME,LOCATION_HOME);
63		$this->appendNavItem(getPath().'update.php',LBL_NAV_UPDATE,LOCATION_UPDATE);
64		$this->appendNavItem(getPath().'search.php',LBL_NAV_SEARCH,LOCATION_SEARCH);
65		$this->appendNavItem(getPath().'admin/',LBL_NAV_CHANNEL_ADMIN,LOCATION_ADMIN);
	62	$this->appendNavItem(getPath(),__('<span>H</span>ome'),LOCATION_HOME);
	63	if (!getConfig("rss.config.restrictrefresh")) {
	64	$this->appendNavItem(getPath().'update.php',__('<span>R</span>efresh'),LOCATION_UPDATE);
	65	}
	66	$this->appendNavItem(getPath().'search.php',__('<span>S</span>earch'),LOCATION_SEARCH);
	67	$this->appendNavItem(getPath().'admin/',__('A<span>d</span>min'),LOCATION_ADMIN);
66	68
67	69	if (($an = rss_plugin_hook('rss.plugins.afternav', null)) != null) {

branches/multiuser/cls/search.php

r1530	r1604
211	211	if ($this->resultsPerPage != INFINE_RESULTS && $this->itemCount > $this->resultsPerPage) {
212	212	$nav .= "<div class=\"readmore\">";
213		$nav .= ~~LBL_SEARCH_RESULTS~~;
	213	$nav .= __('Results: ');
214	214
215	215	// first page

branches/multiuser/cls/taglist.php

r1181	r1604
67	67	function TagList() {
68	68	$this -> populate();
69		$this -> columnTitle = ~~LBL_TAG_TAGS~~;
	69	$this -> columnTitle = __('Tags');
70	70	$GLOBALS['rss']-> feedList = $this;
71	71	}
…	…
84	84
85	85	function getStats() {
86		return sprintf(~~LBL_TAGCOUNT_PF~~, $this -> countTaggedItems, $this->tagCount);
	86	return sprintf(__('<strong>%d</strong> tagged items, in <strong>%d</strong> tags'), $this -> countTaggedItems, $this->tagCount);
87	87	}
88	88

branches/multiuser/cls/update.php

r1524	r1604
76	76
77	77	function populate($updatePrivateAlso = false) {
78		$sql = "select c.id, c.url, c.title from ".getTable("channels") . " c, "
79		. ~~getTable('folders') . " f~~ ";
	78	$sql = "select c.id, c.url, c.title from ".getTable("channels") . " c "
	79	. " inner join ". getTable('folders') . " f on c.parent = f.id";
80	80	$sql .= " where not(c.mode & ".RSS_MODE_DELETED_STATE.") ";
81		~~$sql .= " and c.parent = f.id ";~~
82	81
83	82	if (hidePrivate() && !$updatePrivateAlso) {
…	…
116	115	if ($error & MAGPIE_FEED_ORIGIN_CACHE) {
117	116	if ($error & MAGPIE_FEED_ORIGIN_HTTP_304) {
118		$label = ~~LBL_UPDATE_NOT_MODIFIED~~;
	117	$label = __('OK (304 Not modified)');
119	118	$cls = ERROR_NOERROR;
120	119	}
121	120	elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_TIMEOUT) {
122		$label = ~~LBL_UPDATE_CACHE_TIMEOUT~~;
	121	$label = __('HTTP Timeout (Local cache)');
123	122	$cls = ERROR_WARNING;
124	123	}
125	124	elseif ($error & MAGPIE_FEED_ORIGIN_NOT_FETCHED) {
126		$label = ~~LBL_UPDATE_STATUS_CACHED~~;
	125	$label = __('OK (Local cache)');
127	126	$cls = ERROR_NOERROR;
128	127	}
129	128	elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_404) {
130		$label = ~~LBL_UPDATE_NOT_FOUND~~;
	129	$label = __('404 Not Found (Local cache)');
131	130	$cls = ERROR_ERROR;
132	131	}
…	…
137	136	}
138	137	elseif ($error & MAGPIE_FEED_ORIGIN_HTTP_200) {
139		$label = ~~LBL_UPDATE_STATUS_OK~~;
	138	$label = __('OK (HTTP 200)');
140	139	$cls = ERROR_NOERROR;
141	140	}
142	141	else {
143	142	if (is_numeric($error)) {
144		$label = ~~LBL_UPDATE_STATUS_ERROR~~;
	143	$label = __('ERROR');
145	144	$cls = ERROR_ERROR;
146	145	} else {
…	…
177	176
178	177	echo
179		"<h2>".sprintf(~~LBL_UPDATE_H2~~, count($this -> chans))."</h2>\n"
	178	"<h2>".sprintf(__('Updating %d Feeds...'), count($this -> chans))."</h2>\n"
180	179	."<table id=\"updatetable\">\n"
181	180	."<tr>\n"
182		."<th class=\"lc\">".~~LBL_UPDATE_CHANNEL~~."</th>\n"
183		."<th class=\"mc\">".~~LBL_UPDATE_STATUS~~."</th>\n"
184		."<th class=\"rc\">".~~LBL_UPDATE_UNREAD~~."</th>\n"
	181	."<th class=\"lc\">".__('Feed')."</th>\n"
	182	."<th class=\"mc\">".__('Status')."</th>\n"
	183	."<th class=\"rc\">".__('New Items')."</th>\n"
185	184	."</tr>";
186	185
…	…
239	238	function render() {
240	239
241		echo "<h2 style=\"margin-bottom:1em;\">". sprintf(~~LBL_UPDATE_H2~~,count($this -> chans)) ."</h2>\n";
	240	echo "<h2 style=\"margin-bottom:1em;\">". sprintf(__('Updating %d Feeds...'),count($this -> chans)) ."</h2>\n";
242	241
243	242	echo "<table id=\"updatetable\">\n"
244	243	."<tr>\n"
245		."<th class=\"lc\">".~~LBL_UPDATE_CHANNEL~~."</th>\n"
246		."<th class=\"mc\">".~~LBL_UPDATE_STATUS~~."</th>\n"
247		."<th class=\"rc\">".~~LBL_UPDATE_UNREAD~~."</th>\n"
	244	."<th class=\"lc\">".__('Feed')."</th>\n"
	245	."<th class=\"mc\">".__('Status')."</th>\n"
	246	."<th class=\"rc\">".__('New Items')."</th>\n"
248	247	."</tr>\n";
249	248
…	…
296	295
297	296	list($label,$cls) = parent::magpieError($error);
298		echo "\n$label, $unread " . ~~LBL_UPDATE_UNREAD~~ . "\n\n";
	297	echo "\n$label, $unread " . __('New Items') . "\n\n";
299	298	flush();
300	299
…	…
325	324	$unread = count($unreadIds);
326	325	list($label,$cls) = parent::magpieError($error);
327		echo "\n$label, $unread " . ~~LBL_UPDATE_UNREAD~~ . "<br />";
	326	echo "\n$label, $unread " . __('New Items') . "<br />";
328	327	flush();
329	328	}
…	…
357	356	echo "$title ...\t";
358	357	flush();
359		echo "\n$label, $unread " . ~~LBL_UPDATE_UNREAD~~ . "\n\n";
	358	echo "\n$label, $unread " . __('New Items') . "\n\n";
360	359	flush();
361	360	}

branches/multiuser/cls/wrappers/feeds.php

r1315	r1604
60	60	}
61	61
62		function rss_feeds_folders_unread_count($label=LBL_UNREAD_PF) {
	62	function rss_feeds_folders_unread_count($label=null) {
	63	if ($label === null) {
	64	$label=__('<strong id="%s" style="%s">(%d unread)</strong>');
	65	}
63	66	if (array_key_exists($GLOBALS['rss']->currentFeedsFolder->id,$GLOBALS['rss']->feedList->collapsed_folders)) {
64	67	$sCls = ($GLOBALS['rss']->currentFeedsFolder->isCollapsed?"display:inline":"display:none");
…	…
68	71
69	72	switch( $GLOBALS['rss']->feedList -> columnTitle ) {
70		case ~~LBL_TAG_FOLDERS~~:
	73	case __('Categories'):
71	74	$ret = rss_plugin_hook("rss.plugins.sidemenu.categoryunreadlabel", $ret);
72	75	break;
73		case ~~LBL_H2_CHANNELS~~:
	76	case __('Feeds'):
74	77	$ret = rss_plugin_hook("rss.plugins.sidemenu.folderunreadlabel", $ret);
75	78	break;

branches/multiuser/cls/wrappers/header.php

r1500	r1604
132	132	function rss_footer_last_modif() {
133	133	$ts = getLastModif();
134		return ($ts ? rss_locale_date ("%c", $ts) : ~~LBL_FOOTER_LAST_MODIF_NEVER~~);
	134	return ($ts ? rss_locale_date ("%c", $ts) : __('Never'));
135	135	}
136	136
…	…
140	140
141	141	if (rss_user_level() > RSS_USER_LEVEL_NOLEVEL) {
142		$ret .= sprintf(~~LBL_LOGGED_IN_AS~~, rss_user_name())
143		." \| <a href=\"".getPath()."?logout\">".~~LBL_LOG_OUT~~."</a>\n";
	142	$ret .= sprintf(__('Logged in as <strong>%s</strong>'), rss_user_name())
	143	." \| <a href=\"".getPath()."?logout\">".__('Logout')."</a>\n";
144	144	} else {
145		$ret .= ~~LBL_NOT_LOGGED_IN~~
146		." \| <a href=\"#\" onclick=\"miniloginform(); return false;\">".~~LBL_LOG_IN~~."</a>";
	145	$ret .= __('Not logged in')
	146	." \| <a href=\"#\" onclick=\"miniloginform(); return false;\">".__('Login')."</a>";
147	147	$ret .= "<div style=\"display:none\" id=\"loginformcontainer\">"
148	148	. '<form ' . 'onsubmit="return loginHandler();" ' . 'method="post" action="'.getPath().'">'
149	149	. '<div style="display:inline"><input style=" width:50px;" name="username" id="username" type="text" /></div>'
150	150	. '<div style="display:inline"><input style=" width:50px;" name="password" id="password" type="password" /></div>'
151		. '<div style="display:inline"><input type="submit" value="'.~~LBL_LOG_IN~~.'" /></div>'
	151	. '<div style="display:inline"><input type="submit" value="'.__('Login').'" /></div>'
152	152	. '</form>'
153	153	."</div>\n";
…	…
157	157	}
158	158
	159	function rss_header_doclang() {
	160	return isset($GLOBALS['rssl10n']) && $GLOBALS['rssl10n']->getISOLang() ? $GLOBALS['rssl10n']->getISOLang():'en';
	161	}
159	162	?>

branches/multiuser/cls/wrappers/item.php

r1595	r1604
41	41	}
42	42
43		function rss_item_pl_title($label=LBL_PL_FOR) {
44
	43	function rss_item_pl_title($label=null){
	44	if (null === $label) {
	45	$label = __('Permalink for ');
	46	}
45	47	if (getConfig('rss.output.usepermalinks')) {
46	48	list ($ply, $plm, $pld) = explode(":", rss_date("Y:m:d", $GLOBALS['rss'] -> currentItem -> date, false));

Context Navigation

Legend:

branches/multiuser/admin/channels.php

branches/multiuser/admin/config.php

branches/multiuser/admin/dashboard.php

branches/multiuser/admin/folders.php

branches/multiuser/admin/index.php

branches/multiuser/admin/items.php

branches/multiuser/admin/opml.php

branches/multiuser/admin/plugins.php

branches/multiuser/admin/tags.php

branches/multiuser/admin/themes.php

branches/multiuser/admin/users.php

branches/multiuser/ajax.php

branches/multiuser/api.php

branches/multiuser/author.php

branches/multiuser/cls/alltags.php

branches/multiuser/cls/categories.php

branches/multiuser/cls/channels.php

branches/multiuser/cls/header.php

branches/multiuser/cls/items.php

branches/multiuser/cls/l10n.php

branches/multiuser/cls/nav.php

branches/multiuser/cls/search.php

branches/multiuser/cls/taglist.php

branches/multiuser/cls/update.php

branches/multiuser/cls/wrappers/feeds.php

branches/multiuser/cls/wrappers/header.php

branches/multiuser/cls/wrappers/item.php