Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated Pear Pager class to use Namespaces. Now it is loaded by SplCl…

…assLoader. Updated Object.php to use @package_version@ as part of path to minified js file.
  • Loading branch information...
commit 2a8a2fbdf6b31665b9dd9ade5a3d01800b53c068 1 parent 3e4e2ba
@snytkine authored
View
7 .gitignore
@@ -8,3 +8,10 @@ logs/.*
.idea/
.idea/*/
*admin.xml
+build.xml
+phpunitbootstrap.php
+*.log
+version.ver
+www/phpinfo.php
+www/phpinfo.htm
+
View
8 config/!config.ini.dist
@@ -183,9 +183,13 @@ MAX_AVATAR_UPLOAD_SIZE = 1024000
LOG_PER_SCRIPT = true
; set LOG_FILE_PATH to point to your writable log file to enable logging
; for example: /usr/local/apache/sites/qa.lampcms.com/logs/php.log
-LOG_FILE_PATH = php.log
+;LOG_FILE_PATH = php.log
;/usr/local/apache/sites/lampcms.com/logs/cgiphp.log
-LOG_FILE_PATH_CGI = cgiphp.log
+;LOG_FILE_PATH_CGI = cgiphp.log
+; Directory where log files will reside
+; Must be a writable directory
+; If left blank default will be directory 'log' sibling to www dir.
+LOG_DIR =
;
; base url of your main website. Required value! Leading slash not required.
SITE_URL="http://localhost"
View
96 config/translations/messages.en.xlf
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+<file source-language="en" datatype="plaintext" original="file.ext">
+<body>
+<trans-unit id="1">
+ <source>time_zones</source>
+ <target><![CDATA[
+<option value="UTC">(GMT-12:00) International Date Line West</option>
+<option value="Pacific/Pago_Pago">(GMT-11:00) Midway Island, Samoa</option>
+<option value="Pacific/Honolulu">(GMT-10:00) Hawaii</option>
+<option value="America/Anchorage">(GMT-09:00) Alaska</option>
+<option value="America/Los_Angeles">(GMT-08:00) Pacific Time (US &amp; Canada)</option>
+<option value="America/Tijuana">(GMT-08:00) Tijuana, Baja California</option>
+<option value="America/Phoenix">(GMT-07:00) Arizona</option>
+<option value="America/Chihuahua">(GMT-07:00) Chihuahua, La Paz, Mazatlan</option>
+<option value="America/Denver">(GMT-07:00) Mountain Time (US &amp; Canada)</option>
+<option value="America/Guatemala">(GMT-06:00) Central America</option>
+<option value="America/Chicago">(GMT-06:00) Central Time (US &amp; Canada)</option>
+<option value="America/Mexico_City">(GMT-06:00) Guadalajara, Mexico City, Monterrey</option>
+<option value="America/Regina">(GMT-06:00) Saskatchewan</option>
+<option value="America/Lima">(GMT-05:00) Bogota, Lima, Quito</option>
+<option value="America/New_York">(GMT-05:00) Eastern Time (US &amp; Canada)</option>
+<option value="America/Indianapolis">(GMT-05:00) Indiana (East)</option>
+<option value="America/Halifax">(GMT-04:00) Atlantic Time (Canada)</option>
+<option value="America/La_Paz">(GMT-04:00) Caracas, La Paz</option>
+<option value="America/Manaus">(GMT-04:00) Manaus</option>
+<option value="America/Santiago">(GMT-04:00) Santiago</option>
+<option value="America/St_Johns">(GMT-03:30) Newfoundland</option>
+<option value="America/Sao_Paulo">(GMT-03:00) Brasilia</option>
+<option value="America/Buenos_Aires">(GMT-03:00) Buenos Aires, Georgetown</option>
+<option value="America/Godthab">(GMT-03:00) Greenland</option>
+<option value="America/Montevideo">(GMT-03:00) Montevideo</option>
+<option value="Atlantic/South_Georgia">(GMT-02:00) Mid-Atlantic</option>
+<option value="Atlantic/Azores">(GMT-01:00) Azores</option>
+<option value="Atlantic/Cape_Verde">(GMT-01:00) Cape Verde Is.</option>
+<option value="Africa/Casablanca">(GMT) Casablanca, Monrovia</option>
+<option value="Europe/London">(GMT) Greenwich Mean Time : Dublin, Edinburgh, Lisbon, London</option>
+<option value="Europe/Amsterdam">(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna</option>
+<option value="Europe/Belgrade">(GMT+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague</option>
+<option value="Europe/Brussels">(GMT+01:00) Brussels, Copenhagen, Madrid, Paris</option>
+<option value="Europe/Warsaw">(GMT+01:00) Sarajevo, Skopje, Warsaw, Zagreb</option>
+<option value="Africa/Lagos">(GMT+01:00) West Central Africa</option>
+<option value="Asia/Amman">(GMT+02:00) Amman</option>
+<option value="Europe/Athens">(GMT+02:00) Athens, Bucharest, Istanbul</option>
+<option value="Asia/Beirut">(GMT+02:00) Beirut</option>
+<option value="Africa/Cairo">(GMT+02:00) Cairo</option>
+<option value="Africa/Harare">(GMT+02:00) Harare, Pretoria</option>
+<option value="Europe/Helsinki">(GMT+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius</option>
+<option value="Asia/Jerusalem">(GMT+02:00) Jerusalem</option>
+<option value="Europe/Minsk">(GMT+02:00) Minsk</option>
+<option value="Africa/Windhoek">(GMT+02:00) Windhoek</option>
+<option value="Asia/Baghdad">(GMT+03:00) Baghdad</option>
+<option value="Asia/Kuwait">(GMT+03:00) Kuwait, Riyadh</option>
+<option value="Europe/Moscow">(GMT+03:00) Moscow, St. Petersburg, Volgograd</option>
+<option value="Africa/Nairobi">(GMT+03:00) Nairobi</option>
+<option value="Asia/Tbilisi">(GMT+03:00) Tbilisi</option>
+<option value="Asia/Tehran">(GMT+03:30) Tehran</option>
+<option value="Asia/Muscat">(GMT+04:00) Abu Dhabi, Muscat</option>
+<option value="Asia/Baku">(GMT+04:00) Baku</option>
+<option value="Asia/Yerevan">(GMT+04:00) Yerevan</option>
+<option value="Asia/Kabul">(GMT+04:30) Kabul</option>
+<option value="Asia/Yekaterinburg">(GMT+05:00) Ekaterinburg</option>
+<option value="Asia/Karachi">(GMT+05:00) Islamabad, Karachi, Tashkent</option>
+<option value="Asia/Calcutta">(GMT+05:30) Chennai, Kolkata, Mumbai, New Delhi</option>
+<option value="Asia/Colombo">(GMT+05:30) Sri Jayawardenepura</option>
+<option value="Asia/Katmandu">(GMT+05:45) Kathmandu</option>
+<option value="Asia/Almaty">(GMT+06:00) Almaty, Novosibirsk</option>
+<option value="Asia/Dhaka">(GMT+06:00) Astana, Dhaka</option>
+<option value="Asia/Rangoon">(GMT+06:30) Yangon (Rangoon)</option>
+<option value="Asia/Bangkok">(GMT+07:00) Bangkok, Hanoi, Jakarta</option>
+<option value="Asia/Krasnoyarsk">(GMT+07:00) Krasnoyars</option>
+<option value="Asia/Hong_Kong">(GMT+08:00) Beijing, Chongqing, Hong Kong, Urumqi</option>
+<option value="Asia/Irkutsk">(GMT+08:00) Irkutsk, Ulaan Bataar</option>
+<option value="Asia/Singapore">(GMT+08:00) Kuala Lumpur, Singapore</option>
+<option value="Australia/Perth">(GMT+08:00) Perth</option>
+<option value="Asia/Taipei">(GMT+08:00) Taipei</option>
+<option value="Asia/Tokyo">(GMT+09:00) Osaka, Sapporo, Tokyo</option>
+<option value="Asia/Seoul">(GMT+09:00) Seoul</option>
+<option value="Asia/Yakutsk">(GMT+09:00) Yakutsk</option>
+<option value="Australia/Adelaide">(GMT+09:30) Adelaide</option>
+<option value="Australia/Darwin">(GMT+09:30) Darwin</option>
+<option value="Australia/Brisbane">(GMT+10:00) Brisbane</option>
+<option value="Australia/Sydney">(GMT+10:00) Canberra, Melbourne, Sydney</option>
+<option value="Pacific/Guam">(GMT+10:00) Guam, Port Moresby</option>
+<option value="Australia/Hobart">(GMT+10:00) Hobart</option>
+<option value="Asia/Vladivostok">(GMT+10:00) Vladivostok</option>
+<option value="Pacific/Noumea">(GMT+11:00) Magadan, Solomon Is., New Caledonia</option>
+<option value="Pacific/Auckland">(GMT+12:00) Auckland, Wellington</option>
+<option value="Pacific/Fiji">(GMT+12:00) Fiji, Kamchatka, Marshall Is.</option>
+<option value="Pacific/Tongatapu">(GMT+13:00) Nuku&#39;alofa</option></select>
+]]></target>
+</trans-unit>
+
+</body>
+</file>
+</xliff>
View
738 config/translations/messages.ru.xlf
@@ -1,371 +1,371 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
- <file source-language="en" datatype="plaintext" original="file.ext">
- <body>
- <trans-unit id="1">
- <source>Questions</source>
- <target>Вопросы</target>
- </trans-unit>
- <trans-unit id="2">
- <source>Unanswered</source>
- <target>Без ответов</target>
- </trans-unit>
- <trans-unit id="3">
- <source>Tags</source>
- <target>Таги</target>
- </trans-unit>
- <trans-unit id="4">
- <source>Members</source>
- <target>Люди</target>
- </trans-unit>
- <trans-unit id="5">
- <source>Ask Question</source>
- <target>Задать вопрос</target>
- </trans-unit>
- <trans-unit id="6">
- <source>Search</source>
- <target>Поиск</target>
- </trans-unit>
- <trans-unit id="7">
- <source>All questions</source>
- <target>Все вопросы</target>
- </trans-unit>
- <trans-unit id="8">
- <source>Recent Tags</source>
- <target>Последние таги</target>
- </trans-unit>
- <trans-unit id="9">
- <source>Similar questions</source>
- <target>Похожие вопросы</target>
- </trans-unit>
- <trans-unit id="10">
- <source>Home</source>
- <target>Вначало</target>
- </trans-unit>
- <trans-unit id="11">
- <source>Log in</source>
- <target>Войти</target>
- </trans-unit>
- <trans-unit id="12">
- <source>Remember me</source>
- <target>Запомнить</target>
- </trans-unit>
- <trans-unit id="13">
- <source>Username</source>
- <target>Логин</target>
- </trans-unit>
- <trans-unit id="14">
- <source>Password</source>
- <target>Пароль</target>
- </trans-unit>
- <trans-unit id="15">
- <source>Forgot password?</source>
- <target>Забыли пароль?</target>
- </trans-unit>
- <trans-unit id="16">
- <source>Welcome!</source>
- <target>Добро пожаловать</target>
- </trans-unit>
- <trans-unit id="17">
- <source>Sign up</source>
- <target>Регистрация</target>
- </trans-unit>
- <trans-unit id="18">
- <source>Logout</source>
- <target>Выход</target>
- </trans-unit>
- <trans-unit id="19">
- <source>Settings</source>
- <target>Настройки</target>
- </trans-unit>
- <trans-unit id="20">
- <source>Forgotten password</source>
- <target>Восстановление пароля</target>
- </trans-unit>
- <trans-unit id="21">
- <source>forgot_help</source>
- <target>Пожалуйста, укажите Логин или e-mail, который Вы использовали для входа на сайт. </target>
- </trans-unit>
- <trans-unit id="22">
- <source>Username OR Email Address</source>
- <target>Логин или e-mail</target>
- </trans-unit>
- <trans-unit id="23">
- <source>Username OR Email Address</source>
- <target>Логин или e-mail</target>
- </trans-unit>
- <trans-unit id="24">
- <source>Get Password</source>
- <target>Далее</target>
- </trans-unit>
- <trans-unit id="25">
- <source>Required field</source>
- <target>Обязательно заполнить</target>
- </trans-unit>
- <trans-unit id="26">
- <source>Username will appear alongside your posts</source>
- <target>Это будет ваш ник</target>
- </trans-unit>
- <trans-unit id="27">
- <source>Question tags</source>
- <target>Таги этого вопроса</target>
- </trans-unit>
- <trans-unit id="28">
- <source>Asked</source>
- <target>Вопрос был задан</target>
- </trans-unit>
- <trans-unit id="29">
- <source>Last updated</source>
- <target>Последнее сообщение</target>
- </trans-unit>
- <trans-unit id="30">
- <source>Number of Answers</source>
- <target>Всего ответов</target>
- </trans-unit>
- <trans-unit id="31">
- <source>Number of Views</source>
- <target>Количество просмотров</target>
- </trans-unit>
- <trans-unit id="32">
- <source>Reply</source>
- <target>Ответить</target>
- </trans-unit>
- <trans-unit id="33">
- <source>Your answer</source>
- <target>Можете ответить?</target>
- </trans-unit>
- <trans-unit id="34">
- <source>Be the first to answer this question</source>
- <target>Знаете ответ? Так чего-ж не отвечаете?</target>
- </trans-unit>
- <trans-unit id="35">
- <source>Alert</source>
- <target>Внимание</target>
- </trans-unit>
- <trans-unit id="36">
- <source>Please Register or Login to perform this action</source>
- <target>Для этого надо сначала зарегистрироваться на сайте или залогиниться</target>
- </trans-unit>
- <trans-unit id="37">
- <source>Be the first to answer this question</source>
- <target>Знаете ответ? Так чего-ж не отвечаете?</target>
- </trans-unit>
- <trans-unit id="38">
- <source>add comment</source>
- <target>Добавить комментарий</target>
- </trans-unit>
- <trans-unit id="39">
- <source>Reply</source>
- <target>Ответить</target>
- </trans-unit>
- <trans-unit id="40">
- <source>Reply to this comment</source>
- <target>Ответить на этот комментарий</target>
- </trans-unit>
- <trans-unit id="41">
- <source>Submit answer</source>
- <target>Ответить</target>
- </trans-unit>
- <trans-unit id="42">
- <source>Follow this question</source>
- <target>Следить за этим вопросом</target>
- </trans-unit>
- <trans-unit id="43">
- <source>Follow this question to be notified of new answers, comments and edits</source>
- <target>Получать уведомлемия когда будут новые ответы и комментарии к этому вопросу</target>
- </trans-unit>
- <trans-unit id="44">
- <source>Follow this question to be notified of new answers, comments and edits</source>
- <target>Получать уведомлемия когда будут новые ответы и комментарии к этому вопросу</target>
- </trans-unit>
- <trans-unit id="45">
- <source>Questions with no accepted answer</source>
- <target>Без принятых ответов</target>
- </trans-unit>
- <trans-unit id="46">
- <source>Questions with no answers</source>
- <target>Вопросы без единого ответа</target>
- </trans-unit>
- <trans-unit id="47">
- <source>Unanswered tags</source>
- <target>Таги неотвеченных вопросов</target>
- </trans-unit>
- <trans-unit id="48">
- <source>Follow this tag</source>
- <target>Следить за этим тагом</target>
- </trans-unit>
- <trans-unit id="49">
- <source>Follow this tag to be notified when new questions are added</source>
- <target>Получать уведомлемия когда будут новые вопросы с этим тагом</target>
- </trans-unit>
- <trans-unit id="50">
- <source>Unanswered tags</source>
- <target>Таги неотвеченных вопросов</target>
- </trans-unit>
- <trans-unit id="51">
- <source>Related Tags</source>
- <target>Спаренные таги</target>
- </trans-unit>
- <trans-unit id="52">
- <source>Tagged</source>
- <target>Таг</target>
- </trans-unit>
- <trans-unit id="53">
- <source>Edited</source>
- <target>Редактированно</target>
- </trans-unit>
- <trans-unit id="54">
- <source>Please enter between {min_tags} and {max_tags} tags, separated by spaces</source>
- <target>Укажите от {min_tags} до {max_tags} тагов к этому вопросу</target>
- </trans-unit>
- <trans-unit id="55">
- <source>Preview</source>
- <target>Просмотр</target>
- </trans-unit>
- <trans-unit id="56">
- <source>Enter a descriptive title</source>
- <target>Напишите заголовок для этого вопроса</target>
- </trans-unit>
- <trans-unit id="57">
- <source>Title</source>
- <target>Заголовок</target>
- </trans-unit>
- <trans-unit id="58">
- <source>Submit Question</source>
- <target>Отправить вопрос</target>
- </trans-unit>
- <trans-unit id="59">
- <source>Ask a question</source>
- <target>Задать вопрос</target>
- </trans-unit>
- <trans-unit id="60">
- <source>Edit Profile</source>
- <target>Изменить личные данные</target>
- </trans-unit>
- <trans-unit id="61">
- <source>Change Password</source>
- <target>Изменить пароль</target>
- </trans-unit>
- <trans-unit id="62">
- <source>Email Preferences</source>
- <target>Настройки уведомлений</target>
- </trans-unit>
- <trans-unit id="63">
- <source>Your Email Subscription Preferences</source>
- <target>Выберите, когда получать сообщения на адрес электронной почты</target>
- </trans-unit>
- <trans-unit id="64">
- <source>Password updated successfully</source>
- <target>Пароль изменён</target>
- </trans-unit>
- <trans-unit id="65">
- <source>Save</source>
- <target>Сохранить</target>
- </trans-unit>
- <trans-unit id="66">
- <source>Current Password</source>
- <target>Текущий пароль</target>
- </trans-unit>
- <trans-unit id="67">
- <source>Enter new password</source>
- <target>Новый пароль</target>
- </trans-unit>
- <trans-unit id="68">
- <source>Confirm new password</source>
- <target>Повторите пароль</target>
- </trans-unit>
- <trans-unit id="69">
- <source>Enter your current password</source>
- <target>Введите ваш действующий пароль</target>
- </trans-unit>
- <trans-unit id="70">
- <source>This is not the correct password</source>
- <target>Ваш старый пароль неверен</target>
- </trans-unit>
- <trans-unit id="71">
- <source>Password must be at least 6 characters long and contain at least one number</source>
- <target>Пароль не должен быть короче 6 символов и содержать по меньшей мере одну букву или цифру</target>
- </trans-unit>
- <trans-unit id="72">
- <source>"New password" and "Confirm new password" do not match</source>
- <target>Ваше новое подтверждение пароля не соответствует вашему новому паролю. Возможно, вы допустили ошибку при наборе. Пожалуйста, наберите и подтверждите свой новый пароль ещё раз</target>
- </trans-unit>
- <trans-unit id="73">
- <source>Newest</source>
- <target>Последнии</target>
- </trans-unit>
- <trans-unit id="74">
- <source>Most Voted</source>
- <target>Популярные</target>
- </trans-unit>
- <trans-unit id="75">
- <source>Most Active</source>
- <target>Обсуждаемые</target>
- </trans-unit>
- <trans-unit id="76">
- <source>Most recent questions</source>
- <target>Недавно добавленные</target>
- </trans-unit>
- <trans-unit id="77">
- <source>Questions with most votes</source>
- <target>С наибольшим количеством оценок</target>
- </trans-unit>
- <trans-unit id="78">
- <source>Questions with most activity</source>
- <target>Наиболее обсуждаемые</target>
- </trans-unit>
- <trans-unit id="79">
- <source>Questions with highest votes in past 7 days</source>
- <target>Наибольшее количесвто оценок за последние 7 дней</target>
- </trans-unit>
- <trans-unit id="80">
- <source>Active Questions</source>
- <target>Наиболее обсуждаемые</target>
- </trans-unit>
- <trans-unit id="81">
- <source>You have contributed to this question</source>
- <target>Вы автор вопроса или вы комментировали или отвечали на этот вопрос.</target>
- </trans-unit>
- <trans-unit id="82">
- <source>Tags you follow</source>
- <target>Таги на которые вы подписанны</target>
- </trans-unit>
- <trans-unit id="83">
- <source>You are following this question</source>
- <target>Вы поднисанны на этот вопрос</target>
- </trans-unit>
- <trans-unit id="85">
- <source>Number of Questions</source>
- <target>Количество вопросов</target>
- </trans-unit>
- <trans-unit id="86">
- <source>Toggle Unread/Read Status</source>
- <target>Изменить статус сообщения прочитаное/новое</target>
- </trans-unit>
- <trans-unit id="87">
- <source>Asked</source>
- <target>Вопрос задан</target>
- </trans-unit>
- <trans-unit id="88">
- <source>Latest answer by</source>
- <target>Последний ответ от</target>
- </trans-unit>
- <trans-unit id="89">
- <source>Cache Cleared</source>
- <target>Кэш обнулён</target>
- </trans-unit>
- <trans-unit id="90">
- <source>Register</source>
- <target>Зарегистрироваться</target>
- </trans-unit>
- <trans-unit id="91">
- <source>Create New Account</source>
- <target>Создать аккаунт</target>
- </trans-unit>
- <trans-unit id="92">
- <source>Clear Cache</source>
- <target>Обнулить кэш</target>
- </trans-unit>
- </body>
- </file>
-</xliff>
+<file source-language="en" datatype="plaintext" original="file.ext">
+<body>
+<trans-unit id="1">
+ <source>Questions</source>
+ <target>Вопросы</target>
+</trans-unit>
+<trans-unit id="2">
+ <source>Unanswered</source>
+ <target>Без ответов</target>
+</trans-unit>
+<trans-unit id="3">
+ <source>Tags</source>
+ <target>Таги</target>
+</trans-unit>
+<trans-unit id="4">
+ <source>Members</source>
+ <target>Люди</target>
+</trans-unit>
+<trans-unit id="5">
+ <source>Ask Question</source>
+ <target>Задать вопрос</target>
+</trans-unit>
+<trans-unit id="6">
+ <source>Search</source>
+ <target>Поиск</target>
+</trans-unit>
+<trans-unit id="7">
+ <source>All questions</source>
+ <target>Все вопросы</target>
+</trans-unit>
+<trans-unit id="8">
+ <source>Recent Tags</source>
+ <target>Последние таги</target>
+</trans-unit>
+<trans-unit id="9">
+ <source>Similar questions</source>
+ <target>Похожие вопросы</target>
+</trans-unit>
+<trans-unit id="10">
+ <source>Home</source>
+ <target>Вначало</target>
+</trans-unit>
+<trans-unit id="11">
+ <source>Log in</source>
+ <target>Войти</target>
+</trans-unit>
+<trans-unit id="12">
+ <source>Remember me</source>
+ <target>Запомнить</target>
+</trans-unit>
+<trans-unit id="13">
+ <source>Username</source>
+ <target>Логин</target>
+</trans-unit>
+<trans-unit id="14">
+ <source>Password</source>
+ <target>Пароль</target>
+</trans-unit>
+<trans-unit id="15">
+ <source>Forgot password?</source>
+ <target>Забыли пароль?</target>
+</trans-unit>
+<trans-unit id="16">
+ <source>Welcome!</source>
+ <target>Добро пожаловать</target>
+</trans-unit>
+<trans-unit id="17">
+ <source>Sign up</source>
+ <target>Регистрация</target>
+</trans-unit>
+<trans-unit id="18">
+ <source>Logout</source>
+ <target>Выход</target>
+</trans-unit>
+<trans-unit id="19">
+ <source>Settings</source>
+ <target>Настройки</target>
+</trans-unit>
+<trans-unit id="20">
+ <source>Forgotten password</source>
+ <target>Восстановление пароля</target>
+</trans-unit>
+<trans-unit id="21">
+ <source>forgot_help</source>
+ <target>Пожалуйста, укажите Логин или e-mail, который Вы использовали для входа на сайт. </target>
+</trans-unit>
+<trans-unit id="22">
+ <source>Username OR Email Address</source>
+ <target>Логин или e-mail</target>
+</trans-unit>
+<trans-unit id="23">
+ <source>Username OR Email Address</source>
+ <target>Логин или e-mail</target>
+</trans-unit>
+<trans-unit id="24">
+ <source>Get Password</source>
+ <target>Далее</target>
+</trans-unit>
+<trans-unit id="25">
+ <source>Required field</source>
+ <target>Обязательно заполнить</target>
+</trans-unit>
+<trans-unit id="26">
+ <source>Username will appear alongside your posts</source>
+ <target>Это будет ваш ник</target>
+</trans-unit>
+<trans-unit id="27">
+ <source>Question tags</source>
+ <target>Таги этого вопроса</target>
+</trans-unit>
+<trans-unit id="28">
+ <source>Asked</source>
+ <target>Вопрос был задан</target>
+</trans-unit>
+<trans-unit id="29">
+ <source>Last updated</source>
+ <target>Последнее сообщение</target>
+</trans-unit>
+<trans-unit id="30">
+ <source>Number of Answers</source>
+ <target>Всего ответов</target>
+</trans-unit>
+<trans-unit id="31">
+ <source>Number of Views</source>
+ <target>Количество просмотров</target>
+</trans-unit>
+<trans-unit id="32">
+ <source>Reply</source>
+ <target>Ответить</target>
+</trans-unit>
+<trans-unit id="33">
+ <source>Your answer</source>
+ <target>Можете ответить?</target>
+</trans-unit>
+<trans-unit id="34">
+ <source>Be the first to answer this question</source>
+ <target>Знаете ответ? Так чего-ж не отвечаете?</target>
+</trans-unit>
+<trans-unit id="35">
+ <source>Alert</source>
+ <target>Внимание</target>
+</trans-unit>
+<trans-unit id="36">
+ <source>Please Register or Login to perform this action</source>
+ <target>Для этого надо сначала зарегистрироваться на сайте или залогиниться</target>
+</trans-unit>
+<trans-unit id="37">
+ <source>Be the first to answer this question</source>
+ <target>Знаете ответ? Так чего-ж не отвечаете?</target>
+</trans-unit>
+<trans-unit id="38">
+ <source>add comment</source>
+ <target>Добавить комментарий</target>
+</trans-unit>
+<trans-unit id="39">
+ <source>Reply</source>
+ <target>Ответить</target>
+</trans-unit>
+<trans-unit id="40">
+ <source>Reply to this comment</source>
+ <target>Ответить на этот комментарий</target>
+</trans-unit>
+<trans-unit id="41">
+ <source>Submit answer</source>
+ <target>Ответить</target>
+</trans-unit>
+<trans-unit id="42">
+ <source>Follow this question</source>
+ <target>Следить за этим вопросом</target>
+</trans-unit>
+<trans-unit id="43">
+ <source>Follow this question to be notified of new answers, comments and edits</source>
+ <target>Получать уведомлемия когда будут новые ответы и комментарии к этому вопросу</target>
+</trans-unit>
+<trans-unit id="44">
+ <source>Follow this question to be notified of new answers, comments and edits</source>
+ <target>Получать уведомлемия когда будут новые ответы и комментарии к этому вопросу</target>
+</trans-unit>
+<trans-unit id="45">
+ <source>Questions with no accepted answer</source>
+ <target>Без принятых ответов</target>
+</trans-unit>
+<trans-unit id="46">
+ <source>Questions with no answers</source>
+ <target>Вопросы без единого ответа</target>
+</trans-unit>
+<trans-unit id="47">
+ <source>Unanswered tags</source>
+ <target>Таги неотвеченных вопросов</target>
+</trans-unit>
+<trans-unit id="48">
+ <source>Follow this tag</source>
+ <target>Следить за этим тагом</target>
+</trans-unit>
+<trans-unit id="49">
+ <source>Follow this tag to be notified when new questions are added</source>
+ <target>Получать уведомлемия когда будут новые вопросы с этим тагом</target>
+</trans-unit>
+<trans-unit id="50">
+ <source>Unanswered tags</source>
+ <target>Таги неотвеченных вопросов</target>
+</trans-unit>
+<trans-unit id="51">
+ <source>Related Tags</source>
+ <target>Спаренные таги</target>
+</trans-unit>
+<trans-unit id="52">
+ <source>Tagged</source>
+ <target>Таг</target>
+</trans-unit>
+<trans-unit id="53">
+ <source>Edited</source>
+ <target>Редактированно</target>
+</trans-unit>
+<trans-unit id="54">
+ <source>Please enter between {min_tags} and {max_tags} tags, separated by spaces</source>
+ <target>Укажите от {min_tags} до {max_tags} тагов к этому вопросу</target>
+</trans-unit>
+<trans-unit id="55">
+ <source>Preview</source>
+ <target>Просмотр</target>
+</trans-unit>
+<trans-unit id="56">
+ <source>Enter a descriptive title</source>
+ <target>Напишите заголовок для этого вопроса</target>
+</trans-unit>
+<trans-unit id="57">
+ <source>Title</source>
+ <target>Заголовок</target>
+</trans-unit>
+<trans-unit id="58">
+ <source>Submit Question</source>
+ <target>Отправить вопрос</target>
+</trans-unit>
+<trans-unit id="59">
+ <source>Ask a question</source>
+ <target>Задать вопрос</target>
+</trans-unit>
+<trans-unit id="60">
+ <source>Edit Profile</source>
+ <target>Изменить личные данные</target>
+</trans-unit>
+<trans-unit id="61">
+ <source>Change Password</source>
+ <target>Изменить пароль</target>
+</trans-unit>
+<trans-unit id="62">
+ <source>Email Preferences</source>
+ <target>Настройки уведомлений</target>
+</trans-unit>
+<trans-unit id="63">
+ <source>Your Email Subscription Preferences</source>
+ <target>Выберите, когда получать сообщения на адрес электронной почты</target>
+</trans-unit>
+<trans-unit id="64">
+ <source>Password updated successfully</source>
+ <target>Пароль изменён</target>
+</trans-unit>
+<trans-unit id="65">
+ <source>Save</source>
+ <target>Сохранить</target>
+</trans-unit>
+<trans-unit id="66">
+ <source>Current Password</source>
+ <target>Текущий пароль</target>
+</trans-unit>
+<trans-unit id="67">
+ <source>Enter new password</source>
+ <target>Новый пароль</target>
+</trans-unit>
+<trans-unit id="68">
+ <source>Confirm new password</source>
+ <target>Повторите пароль</target>
+</trans-unit>
+<trans-unit id="69">
+ <source>Enter your current password</source>
+ <target>Введите ваш действующий пароль</target>
+</trans-unit>
+<trans-unit id="70">
+ <source>This is not the correct password</source>
+ <target>Ваш старый пароль неверен</target>
+</trans-unit>
+<trans-unit id="71">
+ <source>Password must be at least 6 characters long and contain at least one number</source>
+ <target>Пароль не должен быть короче 6 символов и содержать по меньшей мере одну букву или цифру</target>
+</trans-unit>
+<trans-unit id="72">
+ <source>"New password" and "Confirm new password" do not match</source>
+ <target>Ваше новое подтверждение пароля не соответствует вашему новому паролю. Возможно, вы допустили ошибку при наборе. Пожалуйста, наберите и подтверждите свой новый пароль ещё раз</target>
+</trans-unit>
+<trans-unit id="73">
+ <source>Newest</source>
+ <target>Последнии</target>
+</trans-unit>
+<trans-unit id="74">
+ <source>Most Voted</source>
+ <target>Популярные</target>
+</trans-unit>
+<trans-unit id="75">
+ <source>Most Active</source>
+ <target>Обсуждаемые</target>
+</trans-unit>
+<trans-unit id="76">
+ <source>Most recent questions</source>
+ <target>Недавно добавленные</target>
+</trans-unit>
+<trans-unit id="77">
+ <source>Questions with most votes</source>
+ <target>С наибольшим количеством оценок</target>
+</trans-unit>
+<trans-unit id="78">
+ <source>Questions with most activity</source>
+ <target>Наиболее обсуждаемые</target>
+</trans-unit>
+<trans-unit id="79">
+ <source>Questions with highest votes in past 7 days</source>
+ <target>Наибольшее количесвто оценок за последние 7 дней</target>
+</trans-unit>
+<trans-unit id="80">
+ <source>Active Questions</source>
+ <target>Наиболее обсуждаемые</target>
+</trans-unit>
+<trans-unit id="81">
+ <source>You have contributed to this question</source>
+ <target>Вы автор вопроса или вы комментировали или отвечали на этот вопрос.</target>
+</trans-unit>
+<trans-unit id="82">
+ <source>Tags you follow</source>
+ <target>Таги на которые вы подписанны</target>
+</trans-unit>
+<trans-unit id="83">
+ <source>You are following this question</source>
+ <target>Вы поднисанны на этот вопрос</target>
+</trans-unit>
+<trans-unit id="85">
+ <source>Number of Questions</source>
+ <target>Количество вопросов</target>
+</trans-unit>
+<trans-unit id="86">
+ <source>Toggle Unread/Read Status</source>
+ <target>Изменить статус сообщения прочитаное/новое</target>
+</trans-unit>
+<trans-unit id="87">
+ <source>Asked</source>
+ <target>Вопрос задан</target>
+</trans-unit>
+<trans-unit id="88">
+ <source>Latest answer by</source>
+ <target>Последний ответ от</target>
+</trans-unit>
+<trans-unit id="89">
+ <source>Cache Cleared</source>
+ <target>Кэш обнулён</target>
+</trans-unit>
+<trans-unit id="90">
+ <source>Register</source>
+ <target>Зарегистрироваться</target>
+</trans-unit>
+<trans-unit id="91">
+ <source>Create New Account</source>
+ <target>Создать аккаунт</target>
+</trans-unit>
+<trans-unit id="92">
+ <source>Clear Cache</source>
+ <target>Обнулить кэш</target>
+</trans-unit>
+</body>
+</file>
+</xliff>
View
4 lib/!inc.php
@@ -72,6 +72,8 @@
mb_internal_encoding("UTF-8");
}
+
+
function exception_handler($e)
{
$code = $e->getCode();
@@ -105,7 +107,6 @@ function fastcgi_finish_request()
set_exception_handler('exception_handler');
-
$lampcmsClasses = LAMPCMS_LIB_DIR . DIRECTORY_SEPARATOR . 'Lampcms' . DIRECTORY_SEPARATOR;
require $lampcmsClasses . 'Interfaces' . DIRECTORY_SEPARATOR . 'All.php';
@@ -118,6 +119,7 @@ function fastcgi_finish_request()
require $lampcmsClasses . 'Config' . DIRECTORY_SEPARATOR . 'Ini.php';
require $lampcmsClasses . 'Log.php';
require $lampcmsClasses . 'Request.php';
+
require $lampcmsClasses . DIRECTORY_SEPARATOR . 'Mongo' . DIRECTORY_SEPARATOR . 'DB.php';
require $lampcmsClasses . DIRECTORY_SEPARATOR . 'Mongo' . DIRECTORY_SEPARATOR . 'Doc.php'; // User extends it
require $lampcmsClasses . 'User.php'; // User is always used
View
29 lib/Lampcms/Config/Ini.php
@@ -3,7 +3,7 @@
*
* License, TERMS and CONDITIONS
*
- * This software is licensed under the GNU LESSER GENERAL PUBLIC LICENSE (LGPL) version 3
+ * This software is lisensed under the GNU LESSER GENERAL PUBLIC LICENSE (LGPL) version 3
* Please read the license here : http://www.gnu.org/licenses/lgpl-3.0.txt
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* the website's Questions/Answers functionality is powered by lampcms.com
* An example of acceptable link would be "Powered by <a href="http://www.lampcms.com">LampCMS</a>"
* The location of the link is not important, it can be in the footer of the page
- * but it must not be hidden by style attributes
+ * but it must not be hidden by style attibutes
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@@ -83,6 +83,7 @@ class Ini extends \Lampcms\LampcmsArray
* Constructor
*
* @param string $iniFile
+ *
* @throws IniException if unable to parse ini file
*
*/
@@ -110,6 +111,7 @@ public function __construct($iniFile = null)
* object
*
* @param string $name
+ *
* @throws IniException if CONSTANTS key
* does not exist OR if var
* does not exist and is a required var
@@ -144,18 +146,18 @@ public function getVar($name)
}
- if (!\array_key_exists($name, $aConstants) && !$this->offsetExists($name)) {
+ if (!array_key_exists($name, $aConstants) && !$this->offsetExists($name) && ('LOG_FILE_PATH' !== $name)) {
throw new IniException('Error: configuration param: ' . $name . ' does not exist in config file ' . $this->iniFile);
}
if ('MAGIC_MIME_FILE' === $name) {
- if (!empty($aConstants['MAGIC_MIME_FILE']) && !\is_readable($aConstants['MAGIC_MIME_FILE'])) {
+ if (!empty($aConstants['MAGIC_MIME_FILE']) && !is_readable($aConstants['MAGIC_MIME_FILE'])) {
throw new IniException('magic mime file does not exist in this location or not readable: ' . $aConstants['MAGIC_MIME_FILE']);
}
}
- switch ($name) {
+ switch ( $name ) {
case 'SITE_URL':
if (empty($aConstants['SITE_URL'])) {
throw new IniException('Value of SITE_URL in ' . $this->iniFile . ' file SHOULD NOT be empty!');
@@ -211,11 +213,18 @@ public function getVar($name)
}
break;
+
+ case 'LOG_DIR':
+ $ret = (empty($aConstants['LOG_DIR'])) ? \dirname(LAMPCMS_WWW_DIR) . DIRECTORY_SEPARATOR . 'logs' : \rtrim($aConstants['LOG_DIR'], DIRECTORY_SEPARATOR);
+ break;
+
case 'LOG_FILE_PATH':
- if ((\substr(PHP_SAPI, 0, 3) === 'cli') || (\substr(PHP_SAPI, 0, 3) === 'cgi')) {
- $ret = $aConstants['LOG_FILE_PATH_CGI'];
+ if (\substr(PHP_SAPI, 0, 3) === 'cli') {
+ $ret = $this->__get('LOG_DIR') . DIRECTORY_SEPARATOR . 'cli-php.log';
+ } elseif ((\substr(PHP_SAPI, 0, 3) === 'cgi')) {
+ $ret = $this->__get('LOG_DIR') . DIRECTORY_SEPARATOR . 'cgi-php.log';
} else {
- $ret = $aConstants['LOG_FILE_PATH'];
+ $ret = $this->__get('LOG_DIR') . DIRECTORY_SEPARATOR . 'php.log';
}
break;
@@ -253,7 +262,9 @@ public function getVar($name)
* most of the times
*
* @return string a value of $name
+ *
* @param string $name
+ *
* @throws LampcmsIniException if $name
* does not exist as a key in this->aIni
*
@@ -302,7 +313,7 @@ public function getSection($name)
*
* @param string $name name of section in !config.ini file
*
- * @param array $val array of values for this section
+ * @param array $val array of values for this section
*
* @return object $this
*/
View
70 lib/Lampcms/Controllers/Editprofile.php
@@ -58,6 +58,7 @@
class Editprofile extends WebPage
{
+
/**
* Pre-check to deny non-logged in user
* access to this page
@@ -71,6 +72,7 @@ class Editprofile extends WebPage
*
* Viewer must have edit_profile
* permission to access this page
+ *
* @var string
*/
protected $permission = 'edit_profile';
@@ -104,10 +106,10 @@ class Editprofile extends WebPage
protected function main()
{
$this->getUser();
- $this->Form = new \Lampcms\Forms\Profile($this->Registry);
- $this->Form->formTitle = $this->aPageVars['title'] = '@@Edit Profile@@';
+ $this->Form = new \Lampcms\Forms\Profile($this->Registry);
+ $this->Form->formTitle = $this->aPageVars['title'] = '@@Edit Profile@@';
- if ($this->Form->isSubmitted() && $this->Form->validate()) {
+ if ($this->Form->isSubmitted() && $this->Form->validate()) {
$this->Registry->Dispatcher->post($this->Form, 'onBeforeProfileUpdate');
//try{
$this->saveProfile();
@@ -122,7 +124,7 @@ protected function main()
$this->setForm();
$this->aPageVars['body'] = $this->Form->getForm();
}
- }
+ }
/**
@@ -158,24 +160,24 @@ protected function getUser()
protected function setForm()
{
- $this->Form->username = $this->User['username'];
+ $this->Form->username = $this->User['username'];
$this->Form->usernameLabel = '@@Username@@';
- $this->Form->fn = $this->User['fn'];
- $this->Form->mn = $this->User['mn'];
- $this->Form->ln = $this->User['ln'];
- $this->Form->gender = $this->getGenderOptions();
- $this->Form->dob = $this->User['dob'];
- $this->Form->cc = $this->getCountryOptions();
- $this->Form->state = $this->User['state'];
- $this->Form->city = $this->User['city'];
- $this->Form->url = $this->User['url'];
- $this->Form->zip = $this->User['zip'];
- $this->Form->description = $this->User['description'];
- $this->Form->avatarSrc = $this->User->getAvatarSrc();
- $this->Form->width = $this->Registry->Ini->AVATAR_SQUARE_SIZE;
- $this->Form->uid = $this->User->getUid();
+ $this->Form->fn = $this->User['fn'];
+ $this->Form->mn = $this->User['mn'];
+ $this->Form->ln = $this->User['ln'];
+ $this->Form->gender = $this->getGenderOptions();
+ $this->Form->dob = $this->User['dob'];
+ $this->Form->cc = $this->getCountryOptions();
+ $this->Form->state = $this->User['state'];
+ $this->Form->city = $this->User['city'];
+ $this->Form->url = $this->User['url'];
+ $this->Form->zip = $this->User['zip'];
+ $this->Form->description = $this->User['description'];
+ $this->Form->avatarSrc = $this->User->getAvatarSrc();
+ $this->Form->width = $this->Registry->Ini->AVATAR_SQUARE_SIZE;
+ $this->Form->uid = $this->User->getUid();
$this->Form->maxAvatarSize = $this->Registry->Ini->MAX_AVATAR_UPLOAD_SIZE;
- $this->Form->timezone = \Lampcms\TimeZone::getMenu($this->User->getTimezone());
+ $this->Form->timezone = $this->getTimeZonesMenu(); //\Lampcms\TimeZone::getMenu($this->User->getTimezone());
$this->Form->avatarTos = \sprintf('@@Upload Image. Maximum size of@@ %sMb<br><span class="smaller">@@By uploading a file you certify that you have the right to distribute this picture and that it does not violate the Terms of Service@@</span>', \floor($this->Registry->Ini->MAX_AVATAR_UPLOAD_SIZE / 1000000));
@@ -192,6 +194,14 @@ protected function setForm()
}
+ protected function getTimeZonesMenu(){
+ $menu = $this->_('time_zones');
+ $current = $this->User->getTimezone();
+
+ return \str_replace('value="'.$current.'"', 'value="'.$this->User->getTimezone().'" selected="selected"', $menu );
+ }
+
+
/**
* Save changed to user profile
* using ProfileParser class
@@ -221,23 +231,23 @@ protected function saveProfile()
* menu for Country selection
*
* @todo use 'cc' key from USER as value
- * and country name only as label! Don NOT
- * set 'country' key at all!
- * For this we need an array that translates
+ * and country name only as label! Don NOT
+ * set 'country' key at all!
+ * For this we need an array that translates
* 2-letter country code 'cc' to the full country name
*
* @return string html string
*/
protected function getCountryOptions()
{
- $s = '';
- $current = \strtoupper($this->Registry->Viewer['cc']);
- $tpl = '<option value="%1$s"%2$s>%3$s</option>';
+ $s = '';
+ $current = \strtoupper($this->Registry->Viewer['cc']);
+ $tpl = '<option value="%1$s"%2$s>%3$s</option>';
$aCountries = \array_combine(\Lampcms\Geo\Location::getCodes(), \Lampcms\Geo\Location::getNames());
foreach ($aCountries as $key => $val) {
$selected = ($current == $key) ? ' selected' : '';
- $name = (empty($val)) ? '@@Select country@@' : $val;
+ $name = (empty($val)) ? '@@Select country@@' : $val;
$s .= \vsprintf($tpl, array($key, $selected, $name));
}
@@ -258,9 +268,9 @@ protected function getCountryOptions()
protected function getGenderOptions()
{
$current = $this->Registry->Viewer['gender'];
- $s = '';
- $a = array('' => '@@Select Gender@@', 'M' => '@@Male@@', 'F' => '@@Female@@');
- $tpl = '<option value="%1$s"%2$s>%3$s</option>';
+ $s = '';
+ $a = array('' => '@@Select Gender@@', 'M' => '@@Male@@', 'F' => '@@Female@@');
+ $tpl = '<option value="%1$s"%2$s>%3$s</option>';
foreach ($a as $key => $val) {
$selected = ($key === $current) ? ' selected' : '';
$s .= \vsprintf($tpl, array($key, $selected, $val));
View
7 lib/Lampcms/H2t.php
@@ -116,7 +116,8 @@ class H2t
* Constructor, cannot be called
* directly, only via factory!
*
- * @return void
+ * @throws Exception
+ * @return \Lampcms\H2t
*/
protected function __construct()
{
@@ -205,7 +206,7 @@ public function loadHtml($sHtml)
protected function makeXslProcessor()
{
$xsl = new \DOMDocument;
- $tpl = LAMPCMS_PATH . DIRECTORY_SEPARATOR . $this->templateFile;
+ $tpl = LAMPCMS_LIB_DIR . DIRECTORY_SEPARATOR . $this->templateFile;
if (!is_file($tpl)) {
throw new HTML2TextException('XSL template not found here: ' . $tpl);
}
@@ -254,5 +255,3 @@ public function __toString()
}
}
-
-?>
View
23 lib/Lampcms/Object.php
@@ -52,7 +52,8 @@
namespace Lampcms;
-const JS_MIN_ID = '122411';
+//const JS_MIN_ID = '@package_version@';
+const VERSION_ID = '@package_version@';
const LF = "\n";
const CR = "\r";
@@ -64,20 +65,6 @@
const LB = "\n<br/>";
-/**
- * name of directory where the index.php
- * is located. This is NOT a full path, just a directory name!
- * Default is www and should not be changed unless
- * you must have specific name of your root www dir
- * maybe a web host requires this directory
- * to be named 'htdocs' or something else, then you would
- * copy everything from 'www' to this 'htdocs' and then
- * put 'htdocs' as a value of WWW_DIR here
- *
- * @deprecated
- */
-//const WWW_DIR = 'www';
-
/**
* These constants should not be changed
@@ -399,6 +386,7 @@ public function serialize()
* @see ArrayObject::unserialize()
*
* @param string $serialized
+ * @return mixed|void
*/
public function unserialize($serialized)
{
@@ -586,7 +574,7 @@ public function __isset($name)
*
* @param string $name
*
- * @return unknown
+ * @return mixed null|string|int
*/
public function offsetGet($name)
{
@@ -616,7 +604,7 @@ public function setDefaultValue($val)
/**
* Getter method for $this->defaultValue
- * this is not very usefull, usually only used
+ * this is not very useful, usually only used
* when you want to see what the defaultValue is
* (mostly during debugging)
*
@@ -679,6 +667,7 @@ public function serialize()
* @see Lampcms.LampcmsArray::unserialize()
*
* @param string $serialized
+ * @return mixed|void
*/
public function unserialize($serialized)
{
View
17 lib/Lampcms/Paginator.php
@@ -69,7 +69,7 @@ class Paginator
* This is how this object is usually
* instantiated
* No parameters are necessary
- * but for backward compatability it
+ * but for backward compatibility it
* can accept one param, but it's totally ignored
* This is because originally it used to accept Registry object
* and other methods still passing Registry to it but
@@ -118,13 +118,13 @@ public function paginate($arrData = null, $perPage, $arrExtraParams = array())
$arrParams = array('mode' => 'Sliding', 'fileName' => '{_PAGER_PREFIX_}%d{_PAGER_EXT_}', 'path' => '', 'append' => false, 'perPage' => $perPage, 'delta' => 2, 'urlVar' => 'pageID');
if (!empty($arrData)) {
- if (is_array($arrData)) {
+ if (\is_array($arrData)) {
d('arrData: ' . print_r($arrData, true));
$arrParams['itemData'] = $arrData;
- } elseif (is_numeric($arrData)) {
+ } elseif (\is_numeric($arrData)) {
d('totalItems: ' . $arrData);
$arrParams['totalItems'] = $arrData;
- } elseif (is_object($arrData) && ($arrData instanceof \MongoCursor)) {
+ } elseif (\is_object($arrData) && ($arrData instanceof \MongoCursor)) {
d('got mongo cursor');
$mongoCursor = $arrData;
$arrParams['totalItems'] = $mongoCursor->count(true);
@@ -132,18 +132,15 @@ public function paginate($arrData = null, $perPage, $arrExtraParams = array())
}
else {
- throw new DevException('Wrong type for $arrData param. It must be array or numeric value. Passed: ' . gettype($arrData) . ' ' . \get_class($arrData));
+ throw new DevException('Wrong type for $arrData param. It must be array or numeric value. Passed: ' . \gettype($arrData) . ' ' . \get_class($arrData));
}
}
if (!empty($arrExtraParams)) {
- $arrParams = array_merge($arrParams, $arrExtraParams); // this way we can pass extra parameters here
+ $arrParams = \array_merge($arrParams, $arrExtraParams); // this way we can pass extra parameters here
}
- include_once(LAMPCMS_LIB_DIR . DIRECTORY_SEPARATOR . 'Pear' . DIRECTORY_SEPARATOR . 'Pager.php');
- include_once(LAMPCMS_LIB_DIR . DIRECTORY_SEPARATOR . 'Pear' . DIRECTORY_SEPARATOR . 'Pager' . DIRECTORY_SEPARATOR . 'Common.php');
-
- $this->oPager = \Pager::factory($arrParams);
+ $this->oPager = \Pear\Pager::factory($arrParams);
if (null !== $mongoCursor) {
$curPage = $this->oPager->getCurrentPageID();
View
3  lib/Lampcms/SplClassLoader.php
@@ -84,6 +84,7 @@ class SplClassLoader
* @todo use constant LAMPCMS_LIB_DIR if $includePath not passed
*
* @param string $ns The namespace to use.
+ * @param string $includePath
*/
public function __construct($ns = null, $includePath = LAMPCMS_LIB_DIR)
{
@@ -180,6 +181,8 @@ public function unregister()
* Loads the given class or interface.
*
* @param string $className The name of the class to load.
+ *
+ * @throws \OutOfBoundsException if class file not found or cannot be included
* @return void
*/
public function loadClass($className)
View
9 lib/Lampcms/WebPage.php
@@ -427,15 +427,16 @@ protected function initPageVars()
$this->aPageVars['comments_timeout'] = $Ini->COMMENT_EDIT_TIME;
$this->aPageVars['layoutID'] = $this->layoutID;
$this->aPageVars['DISABLE_AUTOCOMPLETE'] = $Ini->DISABLE_AUTOCOMPLETE;
- $this->aPageVars['JS_MIN_ID'] = JS_MIN_ID;
+ $this->aPageVars['VERSION_ID'] = VERSION_ID;
$this->aPageVars['home'] = $this->_('Home');
/**
* @todo later can change to something like
* $this->Registrty->Viewer->getStyleID()
+ * To load style selected by user
*
*/
- $css = (true === LAMPCMS_DEBUG) ? '/_main.css?t='.time() : '/main.css';
+ $css = (true === LAMPCMS_DEBUG || '@package_version@' === VERSION_ID) ? '/_main.css?t='.time() : '/main.css';
$this->aPageVars['main_css'] = $Ini->CSS_SITE . '{_DIR_}/style/' . STYLE_ID . '/' . VTEMPLATES_DIR . $css;
$aFacebookConf = $Ini->getSection('FACEBOOK');
@@ -464,8 +465,8 @@ protected function initPageVars()
*/
$this->addMetaTag('fb', ('' !== (string)$Viewer->getFacebookToken()));
- $js = (true === LAMPCMS_DEBUG) ? '/qa.js?t='.time() : '/min/qa_' . JS_MIN_ID . '.js';
- //$js = (true === LAMPCMS_DEBUG) ? '/temp1.js' : '/min/qa_'.JS_MIN_ID.'.js';
+ $js = (true === LAMPCMS_DEBUG || '@package_version@' === VERSION_ID) ? '/qa.js?t='.time() : '/min/qa_' . VERSION_ID . '.js';
+
$src = $Ini->JS_SITE . '{_DIR_}/js' . $js;
$this->aPageVars['JS'] = $src;
View
8 lib/Pear/Pager.php
@@ -36,7 +36,7 @@
*
*/
-//namespace Pear;
+namespace Pear;
/**
@@ -65,11 +65,7 @@ class Pager
public static function factory($options = array())
{
$mode = (isset($options['mode']) ? ucfirst($options['mode']) : 'Jumping');
- $classname = 'Pager_' . $mode;
- $classfile = DIRECTORY_SEPARATOR . 'Pager' . DIRECTORY_SEPARATOR . $mode . '.php';
- //$common = DIRECTORY_SEPARATOR . 'Pager' . DIRECTORY_SEPARATOR . 'Common.php';
-
- include_once(LAMPCMS_LIB_DIR . DIRECTORY_SEPARATOR . 'Pear' . $classfile);
+ $classname = '\\Pear\\Pager\\'.$mode;
$pager = new $classname($options);
return $pager;
View
5 lib/Pear/Pager/Common.php
@@ -39,6 +39,8 @@
//namespace Pear;
+namespace Pear\Pager;
+
/**
* Two constants used to guess the path- and file-name of the page
* when the user doesn't set any other value
@@ -79,7 +81,7 @@
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @link http://pear.php.net/package/Pager
*/
-abstract class Pager_Common
+abstract class Common
{
const PAGER_OK = 0;
@@ -1520,6 +1522,7 @@ public function setOptions($options)
*
* @param string $name option name
*
+ * @throws Exception
* @return mixed option value
* @access public
*/
View
524 lib/Pear/Pager/Jumping.php
@@ -1,263 +1,261 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Contains the Pager_Jumping class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category HTML
- * @package Pager
- * @author Lorenzo Alberton <l.alberton@quipo.it>
- * @author Richard Heyes <richard@phpguru.org>
- * @copyright 2003-2008 Lorenzo Alberton, Richard Heyes
- * @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
- * @version CVS: $Id: Jumping.php,v 1.20 2008/03/05 13:57:45 quipo Exp $
- * @link http://pear.php.net/package/Pager
- */
-
-
-/**
- * require PEAR::Pager_Common base class
- */
-//require_once 'Pager/Common.php';
-
-/**
- * Pager_Jumping - Generic data paging class ("jumping window" style)
- * Handles paging a set of data. For usage see the example.php provided.
- *
- * @category HTML
- * @package Pager
- * @author Lorenzo Alberton <l.alberton@quipo.it>
- * @author Richard Heyes <richard@phpguru.org>
- * @copyright 2003-2008 Lorenzo Alberton, Richard Heyes
- * @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
- * @link http://pear.php.net/package/Pager
- */
-class Pager_Jumping extends Pager_Common
-{
- // {{{ Pager_Jumping()
-
- /**
- * Constructor
- *
- * @param array $options Associative array of option names and their values
- *
- * @access public
- */
- function Pager_Jumping($options = array())
- {
- $err = $this->setOptions($options);
- if ($err !== self::PAGER_OK) {
- throw new \Exception($err);
- }
-
- $this->build();
- }
-
- // }}}
- // {{{ getPageIdByOffset()
-
- /**
- * Returns pageID for given offset
- *
- * @param integer $index Offset to get pageID for
- *
- * @return int PageID for given offset
- */
- function getPageIdByOffset($index)
- {
- if (!isset($this->_pageData)) {
- $this->_generatePageData();
- }
-
- if (($index % $this->_perPage) > 0) {
- $pageID = ceil((float)$index / (float)$this->_perPage);
- } else {
- $pageID = $index / $this->_perPage;
- }
- return $pageID;
- }
-
- // }}}
- // {{{ getPageRangeByPageId()
-
- /**
- * Given a PageId, it returns the limits of the range of pages displayed.
- * While getOffsetByPageId() returns the offset of the data within the
- * current page, this method returns the offsets of the page numbers interval.
- * E.g., if you have pageId=3 and delta=10, it will return (1, 10).
- * PageID of 8 would give you (1, 10) as well, because 1 <= 8 <= 10.
- * PageID of 11 would give you (11, 20).
- * If the method is called without parameter, pageID is set to currentPage#.
- *
- * @param integer $pageid PageID to get offsets for
- *
- * @return array First and last offsets
- * @access public
- */
- function getPageRangeByPageId($pageid = null)
- {
- $pageid = isset($pageid) ? (int)$pageid : $this->_currentPage;
- if (isset($this->_pageData[$pageid]) || is_null($this->_itemData)) {
- // I'm sure I'm missing something here, but this formula works
- // so I'm using it until I find something simpler.
- $start = ((($pageid + (($this->_delta - ($pageid % $this->_delta))) % $this->_delta) / $this->_delta) - 1) * $this->_delta + 1;
- return array(
- max($start, 1),
- min($start + $this->_delta - 1, $this->_totalPages)
- );
- } else {
- return array(0, 0);
- }
- }
-
- // }}}
- // {{{ getLinks()
-
- /**
- * Returns back/next/first/last and page links,
- * both as ordered and associative array.
- *
- * NB: in original PEAR::Pager this method accepted two parameters,
- * $back_html and $next_html. Now the only parameter accepted is
- * an integer ($pageID), since the html text for prev/next links can
- * be set in the constructor. If a second parameter is provided, then
- * the method act as it previously did. This hack's only purpose is to
- * mantain backward compatibility.
- *
- * @param integer $pageID Optional pageID. If specified, links for that
- * page are provided instead of current one.
- * [ADDED IN NEW PAGER VERSION]
- * @param string $next_html HTML to put inside the next link
- * [deprecated: use the factory instead]
- *
- * @return array Back/pages/next links
- */
- function getLinks($pageID = null, $next_html = '')
- {
- //BC hack
- if (!empty($next_html)) {
- $back_html = $pageID;
- $pageID = null;
- } else {
- $back_html = '';
- }
-
- if (!is_null($pageID)) {
- $this->links = '';
- if ($this->_totalPages > $this->_delta) {
- $this->links .= $this->_printFirstPage();
- }
-
- $_sav = $this->_currentPage;
- $this->_currentPage = $pageID;
-
- $this->links .= $this->_getBackLink('', $back_html);
- $this->links .= $this->_getPageLinks();
- $this->links .= $this->_getNextLink('', $next_html);
- if ($this->_totalPages > $this->_delta) {
- $this->links .= $this->_printLastPage();
- }
- }
-
- $back = str_replace('&nbsp;', '', $this->_getBackLink());
- $next = str_replace('&nbsp;', '', $this->_getNextLink());
- $pages = $this->_getPageLinks();
- $first = $this->_printFirstPage();
- $last = $this->_printLastPage();
- $all = $this->links;
- $linkTags = $this->linkTags;
- $linkTagsRaw = $this->linkTagsRaw;
-
- if (!is_null($pageID)) {
- $this->_currentPage = $_sav;
- }
-
- return array(
- $back,
- $pages,
- trim($next),
- $first,
- $last,
- $all,
- $linkTags,
- 'back' => $back,
- 'pages' => $pages,
- 'next' => $next,
- 'first' => $first,
- 'last' => $last,
- 'all' => $all,
- 'linktags' => $linkTags,
- 'linkTagsRaw' => $linkTagsRaw,
- );
- }
-
- // }}}
- // {{{ _getPageLinks()
-
- /**
- * Returns pages link
- *
- * @param string $url URL to use in the link
- * [deprecated: use the constructor instead]
- *
- * @return string Links
- * @access private
- */
- function _getPageLinks($url = '')
- {
- //legacy setting... the preferred way to set an option now
- //is adding it to the constuctor
- if (!empty($url)) {
- $this->_path = $url;
- }
-
- //If there's only one page, don't display links
- if ($this->_clearIfVoid && ($this->_totalPages < 2)) {
- return '';
- }
-
- $links = '';
- $limits = $this->getPageRangeByPageId($this->_currentPage);
-
- for ($i = $limits[0]; $i <= min($limits[1], $this->_totalPages); $i++) {
- if ($i != $this->_currentPage) {
- $this->range[$i] = false;
- $this->_linkData[$this->_urlVar] = $i;
- $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i);
- } else {
- $this->range[$i] = true;
- $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
- }
- $links .= $this->_spacesBefore
- . (($i != $this->_totalPages) ? $this->_separator . $this->_spacesAfter : '');
- }
- return $links;
- }
-
- // }}}
-}
-
-?>
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Contains the Pager_Jumping class
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category HTML
+ * @package Pager
+ * @author Lorenzo Alberton <l.alberton@quipo.it>
+ * @author Richard Heyes <richard@phpguru.org>
+ * @copyright 2003-2008 Lorenzo Alberton, Richard Heyes
+ * @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
+ * @version CVS: $Id: Jumping.php,v 1.20 2008/03/05 13:57:45 quipo Exp $
+ * @link http://pear.php.net/package/Pager
+ */
+
+namespace Pear\Pager;
+
+
+/**
+ * Pager_Jumping - Generic data paging class ("jumping window" style)
+ * Handles paging a set of data. For usage see the example.php provided.
+ *
+ * @category HTML
+ * @package Pager
+ * @author Lorenzo Alberton <l.alberton@quipo.it>
+ * @author Richard Heyes <richard@phpguru.org>
+ * @copyright 2003-2008 Lorenzo Alberton, Richard Heyes
+ * @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
+ * @link http://pear.php.net/package/Pager
+ */
+class Jumping extends Common
+{
+ // {{{ Pager_Jumping()
+
+ /**
+ * Constructor
+ *
+ * @param array $options Associative array of option names and their values
+ *
+ * @throws \Exception
+ * @return void
+ * @access public
+ */
+ function Pager_Jumping($options = array())
+ {
+ $err = $this->setOptions($options);
+ if ($err !== self::PAGER_OK) {
+ throw new \Exception($err);
+ }
+
+ $this->build();
+ }
+
+ // }}}
+ // {{{ getPageIdByOffset()
+
+ /**
+ * Returns pageID for given offset
+ *
+ * @param integer $index Offset to get pageID for
+ *
+ * @return int PageID for given offset
+ */
+ function getPageIdByOffset($index)
+ {
+ if (!isset($this->_pageData)) {
+ $this->_generatePageData();
+ }
+
+ if (($index % $this->_perPage) > 0) {
+ $pageID = ceil((float)$index / (float)$this->_perPage);
+ } else {
+ $pageID = $index / $this->_perPage;
+ }
+ return $pageID;
+ }
+
+ // }}}
+ // {{{ getPageRangeByPageId()
+
+ /**
+ * Given a PageId, it returns the limits of the range of pages displayed.
+ * While getOffsetByPageId() returns the offset of the data within the
+ * current page, this method returns the offsets of the page numbers interval.
+ * E.g., if you have pageId=3 and delta=10, it will return (1, 10).
+ * PageID of 8 would give you (1, 10) as well, because 1 <= 8 <= 10.
+ * PageID of 11 would give you (11, 20).
+ * If the method is called without parameter, pageID is set to currentPage#.
+ *
+ * @param integer $pageid PageID to get offsets for
+ *
+ * @return array First and last offsets
+ * @access public
+ */
+ function getPageRangeByPageId($pageid = null)
+ {
+ $pageid = isset($pageid) ? (int)$pageid : $this->_currentPage;
+ if (isset($this->_pageData[$pageid]) || is_null($this->_itemData)) {
+ // I'm sure I'm missing something here, but this formula works
+ // so I'm using it until I find something simpler.
+ $start = ((($pageid + (($this->_delta - ($pageid % $this->_delta))) % $this->_delta) / $this->_delta) - 1) * $this->_delta + 1;
+ return array(
+ max($start, 1),
+ min($start + $this->_delta - 1, $this->_totalPages)
+ );
+ } else {
+ return array(0, 0);
+ }
+ }
+
+ // }}}
+ // {{{ getLinks()
+
+ /**
+ * Returns back/next/first/last and page links,
+ * both as ordered and associative array.
+ *
+ * NB: in original PEAR::Pager this method accepted two parameters,
+ * $back_html and $next_html. Now the only parameter accepted is
+ * an integer ($pageID), since the html text for prev/next links can
+ * be set in the constructor. If a second parameter is provided, then
+ * the method act as it previously did. This hack's only purpose is to
+ * maintain backward compatibility.
+ *
+ * @param integer $pageID Optional pageID. If specified, links for that
+ * page are provided instead of current one.
+ * [ADDED IN NEW PAGER VERSION]
+ * @param string $next_html HTML to put inside the next link
+ * [deprecated: use the factory instead]
+ *
+ * @return array Back/pages/next links
+ */
+ function getLinks($pageID = null, $next_html = '')
+ {
+ //BC hack
+ if (!empty($next_html)) {
+ $back_html = $pageID;
+ $pageID = null;
+ } else {
+ $back_html = '';
+ }
+
+ if (!is_null($pageID)) {
+ $this->links = '';
+ if ($this->_totalPages > $this->_delta) {
+ $this->links .= $this->_printFirstPage();
+ }
+
+ $_sav = $this->_currentPage;
+ $this->_currentPage = $pageID;
+
+ $this->links .= $this->_getBackLink('', $back_html);
+ $this->links .= $this->_getPageLinks();
+ $this->links .= $this->_getNextLink('', $next_html);
+ if ($this->_totalPages > $this->_delta) {
+ $this->links .= $this->_printLastPage();
+ }
+ }
+
+ $back = str_replace('&nbsp;', '', $this->_getBackLink());
+ $next = str_replace('&nbsp;', '', $this->_getNextLink());
+ $pages = $this->_getPageLinks();
+ $first = $this->_printFirstPage();
+ $last = $this->_printLastPage();
+ $all = $this->links;
+ $linkTags = $this->linkTags;
+ $linkTagsRaw = $this->linkTagsRaw;
+
+ if (!is_null($pageID)) {
+ $this->_currentPage = $_sav;
+ }
+
+ return array(
+ $back,
+ $pages,
+ trim($next),
+ $first,
+ $last,
+ $all,
+ $linkTags,
+ 'back' => $back,
+ 'pages' => $pages,
+ 'next' => $next,
+ 'first' => $first,
+ 'last' => $last,
+ 'all' => $all,
+ 'linktags' => $linkTags,
+ 'linkTagsRaw' => $linkTagsRaw,
+ );
+ }
+
+ // }}}
+ // {{{ _getPageLinks()
+
+ /**
+ * Returns pages link
+ *
+ * @param string $url URL to use in the link
+ * [deprecated: use the constructor instead]
+ *
+ * @return string Links
+ * @access private
+ */
+ function _getPageLinks($url = '')
+ {
+ //legacy setting... the preferred way to set an option now
+ //is adding it to the constuctor
+ if (!empty($url)) {
+ $this->_path = $url;
+ }
+
+ //If there's only one page, don't display links
+ if ($this->_clearIfVoid && ($this->_totalPages < 2)) {
+ return '';
+ }
+
+ $links = '';
+ $limits = $this->getPageRangeByPageId($this->_currentPage);
+
+ for ($i = $limits[0]; $i <= min($limits[1], $this->_totalPages); $i++) {
+ if ($i != $this->_currentPage) {
+ $this->range[$i] = false;
+ $this->_linkData[$this->_urlVar] = $i;
+ $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i);
+ } else {
+ $this->range[$i] = true;
+ $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
+ }
+ $links .= $this->_spacesBefore
+ . (($i != $this->_totalPages) ? $this->_separator . $this->_spacesAfter : '');
+ }
+ return $links;
+ }
+
+ // }}}
+}
+
View
5 lib/Pear/Pager/Sliding.php
@@ -42,7 +42,7 @@
*/
//require_once 'Pager/Common.php';
-///namespace Pear;
+namespace Pear\Pager;
/**
* Pager_Sliding - Generic data paging class ("sliding window" style)
@@ -55,7 +55,7 @@
* @license http://www.debian.org/misc/bsd.license BSD License (3 Clause)
* @link http://pear.php.net/package/Pager
*/
-class Pager_Sliding extends Pager_Common
+class Sliding extends Common
{
// {{{ Pager_Sliding()
@@ -64,6 +64,7 @@ class Pager_Sliding extends Pager_Common
*
* @param array $options Associative array of option names and their values
*
+ * @throws \Exception
* @access public
*/
public function __construct($options = array())
View
0  plaintext.xsl → lib/plaintext.xsl
File renamed without changes
View
4 tests/bootstrap.php
@@ -116,8 +116,8 @@
define('DEFAULT_LANG', 'en');
define('LAMPCMS_COOKIE_DOMAIN', '');
define('SITE_URL', '');
-define('LAMPCMS_IMAGE_SITE', 'http://img.lampcms.com');
-define('LAMPCMS_AVATAR_IMG_SITE', 'http://img.lampcms.com');
+//define('LAMPCMS_IMAGE_SITE', 'http://img.lampcms.com');
+//define('LAMPCMS_AVATAR_IMG_SITE', 'http://img.lampcms.com');
/**
* This is very important!
* Use test databases!
View
6 www/style/1/www/tplAnswer.php
@@ -96,15 +96,11 @@ protected static function func(&$a)
*/
$rid = $a['_id'];
$uid = $a['i_uid'];
- //$reply = $a['reply'];
- //$reply_t = $a['reply_t'];
$f = function(&$data) use ($rid, $uid)
{
$data['resource_id'] = $rid;
$data['owner_id'] = $uid;
- //$data['reply'] = $reply;
- //$data['reply_t'] = $reply_t;
};
$a['comments_html'] = tplComment::loop($a['a_comments'], true, $f);
@@ -120,7 +116,7 @@ protected static function func(&$a)
'i_votes' => '', // 6
'i_uid' => '0', // 7 // answer author id
'accepted_text' => '', //8
- 'accepted_class' => '@@accept_answer@@', // 9
+ 'accepted_class' => '@@Accept answer@@', // 9
'vote_up' => "\xE2\x87\xA7", // 10 \xE2\x87\xA7
'vote_down' => "\xE2\x87\xA9", //11
'accept_link' => '&nbsp', // 12,
View
2  www/style/1/www/tplMain.php
@@ -87,7 +87,7 @@ class tplMain extends Lampcms\Template\Fast
'show_comments' => '5', //36
'comments_timeout' => '5', //37
'max_comments' => '0', // 38
- 'JS_MIN_ID' => '', // 39
+ 'VERSION_ID' => '', // 39